及

src/views/BasicSettings/SuppliersManage/SippliersStockPriceListEdit.vue

@@ -4,12 +4,14 @@
       <slot name="titleButton">
         <Button @click="showModal=true"
                 type="primary"
+                v-show="$route.query.type!=3"
                 style="margin-right:10px;">选择物料</Button>
         <Button @click="goBack()"
                 type="primary"
                 style="margin-right:10px;">返回</Button>
         <Button @click="handleSet(1)"
                 type="primary"
+                v-show="$route.query.type!=3"
                 style="margin-right:10px;">保存</Button>
       </slot>
     </Toptitle>

src/views/BidSystem/ProductDeOrder/list.vue

@@ -217,13 +217,13 @@ export default {
             h(
               "span",
               {},
-              params.row.state == 0
-                ? "待审核"
-                : params.row.state == 1
-                ? "待拆单"
+              // params.row.state == 0
+              //   ? "待审核"
+                params.row.state == 1
+                ? "未拆单"
                 : params.row.state == 2
-                ? "待生产"
-                : "已完成"
+                ? "拆单中"
+                : "拆单完成"
             ),
         },
         {
@@ -469,10 +469,10 @@ export default {
           serverName: "state",
           value: "",
           option: [
-            { label: "待审核", value: 0 },
-            { label: "待拆单", value: 1 },
-            { label: "待生产", value: 2 },
-            { label: "已完成", value: 3 },
+            //{ label: "待审核", value: 0 },
+            { label: "未拆单", value: 1 },
+            { label: "拆单中", value: 2 },
+            { label: "拆单完成", value: 3 },
           ],
         },
         {

src/views/MeasurementOrderMannage/edit.vue

@@ -148,11 +148,11 @@ export default {
           option: [],
         },
         {
-          title: "产品",
+          title: "产品名称",
           name: "Select",
           multiple: true,
           filterable: true,
-          serverName: "number_detail",
+          serverName: "product",
           placeholder: "请选择",
           value: "",
           option: [],
@@ -162,7 +162,7 @@ export default {
           name: "Select",
           multiple: true,
           filterable: true,
-          serverName: "number_detail",
+          serverName: "url_number",
           placeholder: "请选择",
           value: "",
           option: [],
@@ -200,7 +200,7 @@ export default {
         {
           title: "产品名称",
           align: "center",
-          key: "product_title",
+          key: "product",
           minWidth: 200,
         },
         { title: "产品型号", align: "center", key: "model", minWidth: 150 },
@@ -310,6 +310,12 @@ export default {
       if (this.func.isType(row.number_detail) == "Array") {
         row.number_detail = row.number_detail.join(",");
       }
+      if (this.func.isType(row.product) == "Array") {
+        row.product = row.product.join(",");
+      }
+      if (this.func.isType(row.url_number) == "Array") {
+        row.url_number = row.url_number.join(",");
+      }
       Object.assign(row, this.$route.query);
       Object.assign(this.proxyObj, row);
       this.getData(row);
@@ -334,10 +340,20 @@ export default {
           v.value = v.number_detail;
           v.label = v.number_detail;
         });
+        res.data.product.map((v) => {
+          v.value = v.product;
+          v.label = v.product;
+        });
+        res.data.url_number.map((v) => {
+          v.value = v.url_number;
+          v.label = v.url_number;
+        });
         this.list[0].option = res.data.house;
         this.list[1].option = res.data.unit;
         this.list[2].option = res.data.layer;
         this.list[3].option = res.data.number_detail;
+        this.list[4].option = res.data.product;
+        this.list[5].option = res.data.url_number;
       });
     },
     back() {