yusheng 4 zile în urmă
părinte
comite
6b8efc82d4

+ 3 - 4
manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.4.18",
+    "versionName" : "V1.0.4.19",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {
@@ -12,10 +12,9 @@
                     // "target" : "http://192.168.1.110:18086/",
                     // "target" : "http://123.249.79.125/api/",
                     // "target" : "http://192.168.1.125:18086/",
-                    "target" : "http://192.168.1.251:18086/",
-                    "target" : "http://114.116.248.196:86/api/",
+                    // "target" : "http://114.116.248.196:86/api/",
                     // "target": "http://116.63.185.248:80/api",
-                    // "target" : "http://192.168.1.251:18186/",
+                    "target" : "http://192.168.1.251:18086/",
                     // "target" : "http://aiot.zoomwin.com.cn:51001/api",
                     "changeOrigin" : true,
                     "secure" : false,

+ 22 - 3
pages/pcs/components/workOrderReport.vue

@@ -164,7 +164,8 @@
 									<text class="input-label">值</text>
 
 									<input class="item-input" v-model="item.num" type="text" placeholder="请输入数量"
-										@input="setValue" :disabled="title == '详情'" />
+										@input="setValue" @click.native="addContactName(item,idx)"
+										:disabled="title == '详情'" />
 								</view>
 								<view class="item-row-input" v-if="pageName == 'qualityTestRecords'">
 									<text class="input-label">执行人</text>
@@ -377,6 +378,14 @@
 				uni.$off("setSelectList");
 				uni.$on("setSelectList", (data) => {
 					if (data && data.length > 0) {
+						if (this.currentIndex || this.currentIndex === 0) {
+							this.$set(
+								this.form.detailList[this.currentIndex],
+								'num',
+								data[0].name
+							);
+							return;
+						}
 						this.form.contactName = data[0].name;
 						this.form.contactId = data[0].id;
 						this.form.supplierName = data[0].name;
@@ -429,14 +438,23 @@
 				});
 				this.classificationList = treeList;
 			},
-			selectContactShow(type) {
+			selectContactShow(type, code) {
+				if (code != '09') {
+					this.currentIndex = '';
+				}
 				uni.navigateTo({
 					url: "/pages/saleManage/components/selectContact?isAll=" +
 						false +
 						"&contactType=" +
-						type + '&code=' + this.getCode(),
+						type + '&code=' + (code || this.getCode()),
 				});
 			},
+			addContactName(row, index) {
+				if (row.paramValue == '运输单位' || row.paramValue == '收货单位') {
+					this.currentIndex = index;
+					this.selectContactShow(19, '09');
+				}
+			},
 			confirmProductLine(e) {
 				this.form.productLineId = e.value[0].value;
 				this.form.productLineName = e.value[0].label;
@@ -691,6 +709,7 @@
 				return Promise.all(PromiseAll)
 
 			},
+
 			setValue() {
 				if (this.title == '报工') {
 					this.form.detailList.forEach((item, index) => {

+ 4 - 0
pages/qms/inspectionWork/list.vue

@@ -35,6 +35,10 @@
 								<text>
 									({{item.recordingMethod==1?'按质检项检':"按样品检"}})
 								</text>
+								<text v-if="item.productLineName">
+									{{item.productLineName}}
+								</text>
+								
 							</view>
 						</view>
 						<view class="text">检验项目:</view>