Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/BasicSettings/SuppliersManage/SippliersList.vue

@@ -303,10 +303,9 @@ export default {
                 params: {
                   id: row.id,
                 },
-              })
-                .then((res) => {
+              }).then((res) => {
                   this.$Message.success(res.msg);
-                  this.initData();
+                  this.initData(this.searchData);
                 })
                 .catch((err) => {});
             },

src/views/BidSystem/DeepeningOrder/edit.vue

@@ -25,7 +25,7 @@
       <div><span>产品名称:</span>{{ formData.title }}</div>
       <div><span>数量:</span>{{ formData.num }}</div>
       <div><span>规格:</span>{{ formData.measure }}</div>
-      <div><span>工艺属性:</span>{{ formData.process_property }}</div>
+      <div style="width:auto"><span>工艺属性:</span>{{ formData.process_property }}</div>
       <div><span>图号:</span>{{ formData.url_number }}</div>
       <div>
         <span>图纸:</span>
@@ -678,9 +678,9 @@ export default {
             title: el.title,
             key: el.e_title,
             align: "center",
-            width: "150",
+            // width: "150",
             slot: `formula_${el.e_title}`,
-            resizable: true,
+            // resizable: true,
           });
         });
         this.tableColumns = [...this.tableColumns, ...tempArr];

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -25,7 +25,7 @@
       <div><span>数量:</span>{{ formData.num }}</div>
       <!-- <div><span>价格:</span>{{ formData.price }}</div> -->
       <div><span>规格:</span>{{ formData.measure }}</div>
-      <div><span>工艺属性:</span>{{ formData.process_property }}</div>
+      <div style="width:auto"><span>工艺属性:</span>{{ formData.process_property }}</div>
       <div style="overflow:hidden;">
         <span>图纸:</span>
         <div>

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -92,8 +92,8 @@
             filterable
             style="width: 150px"
           >
-            <Option label="是" :value="2"></Option>
-            <Option label="否" :value="1"></Option>
+            <Option label="是" :value="1"></Option>
+            <Option label="否" :value="0"></Option>
           </Select>
         </FormItem>
         <FormItem>

src/views/MeasurementOrderMannage/edit.vue

@@ -150,9 +150,9 @@ export default {
         {
           title: "产品名称",
           name: "Select",
-          multiple: true,
+         
           filterable: true,
-          serverName: "product",
+          serverName: "product_title",
           placeholder: "请选择",
           value: "",
           option: [],
@@ -160,9 +160,9 @@ export default {
         {
           title: "图号",
           name: "Select",
-          multiple: true,
+        
           filterable: true,
-          serverName: "url_number",
+          serverName: "model",
           placeholder: "请选择",
           value: "",
           option: [],

src/views/ProductionOrderList/ProductionsOrder/list.vue

@@ -51,7 +51,7 @@
              @click="goDetial(row)">详情</a>
           <a v-if='persimissionData["下生产计划"]||persimissionData.all'
              style="margin:0 5px"
-             :disabled="row.is_plan==2"
+             :disabled="row.state==2"
              @click="openModal(row)">下生产排产</a>
         </div>
       </template>