Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2 天以前 1be8d9547d45332fd2cd15206ddaf98baa565c3c

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 pages.json

@@ -1749,6 +1749,12 @@
                "navigationBarTitleText": "销售出库单(验证)"
            }
        },
        {
            "path": "pages/tiaomamingxi/tiaomamingxi",
            "style": {
                "navigationBarTitleText": "条码明细"
            }
        },
        {
            "path": "pages/CustomerComplaintsBill/CustomerComplaintsBillList",
            "style": {

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -41,7 +41,7 @@
            </view>
            <view class="card-item-wrapper">
                <view v-for="(item, index) in materialManifest" :key="index">
                    <uni-card :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '订单号：' + item.F_WPVT_Text_tzk : ''"
                    <uni-card :title="item.HSourceBillNo" :extra="item.客户订单号 ? '订单号：' + item.客户订单号 : ''"
                     @tap="toDetail(item, index)">
                        <view class="card-detail">
                            <view class="detail">
@@ -208,7 +208,7 @@
                    <view class="title">质检员:</view>
                    <view class="right">
                        <uni-combox :candidates="HKeeperNameList" placeholder="请选择质检员"
                            v-model="detailManifestItem.HKeeperName" @input="HKeeperNameChange"></uni-combox>
                            v-model="sourceBillInfo.HKeeperName" @input="HKeeperNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
@@ -320,7 +320,9 @@
                sourceBillInfo: {
                    HSourceBillNo: '',
                    HBillNo: '',
                    HInterID: ''
                    HInterID: '',
                    HKeeperID: getUserInfo()["HEmpID"],
                    HKeeperName: getUserInfo()["HEmpName"]
                },
                // 物料清单
                materialManifest: [],

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue

@@ -50,7 +50,8 @@
            </view>
            <view class="card-item-wrapper">
                <view v-for="(item, index) in materialManifest" :key="index">
                    <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '订单号：' + item.F_WPVT_Text_tzk : ''"
                    <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo" 
                    :extra="item.客户订单号 ? '订单号：' + item.客户订单号 : ''"
                        @tap="selectMater(item, index)">
                        <view class="card-detail">
                            <view class="detail">

 pages/index/login.vue

@@ -114,7 +114,7 @@
                    "陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
                    "张瑞广本地测试": 'http://localhost:8082/API/',
                    "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
                    "杨权鑫本地测试": 'http://192.168.0.81:8082/API/',
                    "杨权鑫本地测试": 'http://172.20.10.2:8082/API/',
                    "王仪本地测试": 'http://192.168.0.74:8080/API/',
                    // 小卫内外网
                    "苏州卫智科技-外网": 'http://221.224.60.42:8082/API_WW/',

 pages/shengchanrukushengdan/Kf_ProductInBill.vue

@@ -776,13 +776,22 @@
                        this.arrayHMainSourceBillType = []
                        this.arrayHMainSourceBillValue = []
                        Array.from(data).forEach(e => {
                            //this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
                            //判断翻译模块字段内容是否存在
                            if(this.$t("Kf_ProductInBill_PDA.select option").length > 0 ){
                                //循环翻译下拉框字段内容
                            for(var j = 0; j < this.$t("Kf_ProductInBill_PDA.select option").length; j++){
                                    //这里是源单类型动态加载，获取翻译字段内容中的源单ID进行翻译匹配
                                let HSourceBillType_FY = this.$t("Kf_ProductInBill_PDA.select option[" + j + "]").split("@");
                                    //动态加载的源单类型ID与翻译文件中设置的源单类型ID一致
                                if(e['HSourceBillType'] == HSourceBillType_FY[0]){
                                        //对源单类型文本进行翻译赋值
                                    this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
                                }
                            }
                            }
                            else{
                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
                            }
                            this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
                        })