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

src/views/Approval/list.vue

@@ -56,7 +56,7 @@ export default {
             { label: '待审批', value: 0 },
             { label: '同意', value: 1 },
             { label: '驳回', value: 2 },
-            { label: '取消', value: 3 },
+            // { label: '取消', value: 3 },
           ]
         },
         {

src/views/BasicSettings/SuppliersManage/SippliersStockPriceListEdit.vue

@@ -285,7 +285,10 @@ export default {
               state: this.$route.query.state
             }
           }).then((res) => {
-            this.$Message.success(res.msg);
+            if (res.code=200) {
+                this.$Message.success(res.msg);
+                this.goBack()
+            }
           }).catch((err) => { });
           break;
         case 2:

src/views/BidSystem/ContractList/edit.vue

@@ -1109,7 +1109,7 @@ export default {
         },
       ],
       supTableColumns: [
-        { title: "序号", key: "index", align: "center" },
+        { title: "序号", type: "index", align: "center" },
         {
           title: "辅料名称",
           key: "title",

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1380,6 +1380,10 @@ export default {
     handleSimilarProductShow() {
       this.showSimilarProductModal = true;
       this.similarProductLoading = true;
+      this.similarProductData.type_name = '';
+      this.similarProductData.title = '';
+      this.similarProductData.model = '';
+      this.similarProductData.url_number = '';
       this.axios("/api/product", {
         params: {
           type_name: this.similarProductData.type_name,

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -28,7 +28,7 @@
               :key="item.id"
               v-show="formData.salesman==item.id">{{formData.salesman}}</span>
       </div>
-      <div><span>订单类型:</span>{{formData.renovation_type==1?"工装":"家装"}}</div>
+      <!-- <div><span>订单类型:</span>{{formData.renovation_type==1?"工装":"家装"}}</div> -->
       <div><span>备注:</span>{{formData.remark}}</div>
     </div>
     <div class="addArea">

src/views/BidSystem/ProductDeOrder/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="BidsList">
     <FullPage
-      title="生产拆单"
+      title="生产拆单列表"
       :list="set_list"
       @init="init"
       :loading="loading"
@@ -67,12 +67,12 @@
           <a style="margin: 0 5px" @click="handleSet(row, index, 2)">拆单</a>
           <a style="margin: 0 5px" @click="handleSet(row, index, 3)">详情</a>
           <a
-            style="margin: 0 5px; color: red"
+            style="margin: 0 5px;"
             :disabled="row.sub_status != 2"
             :style="
               row.sub_status != 2
-                ? 'margin: 0 5px; color: #ccc'
-                : 'margin: 0 5px; color: red'
+                ? 'margin: 0 5px;'
+                : 'margin: 0 5px;'
             "
             @click="handleSet(row, index, 4)"
             >删除</a
@@ -102,7 +102,7 @@
     </FullPage>
     <Modal
       v-model="processModal"
-      title="确认？"
+      title="下生产？"
       @on-ok="handleProcess"
       @on-cancel="processModal = false"
     >
@@ -209,7 +209,7 @@ export default {
             h("span", {}, this.func.replaceDateNoHMS(params.row.end_time)),
         },
         {
-          title: "订单状态",
+          title: "拆单状态",
           align: "center",
           key: "state",
           minWidth: 100,
@@ -289,8 +289,11 @@ export default {
         },
       })
         .then((res) => {
-          this.$Message.success(res.msg);
-          this.getData(this.proxyObj);
+          if(res.state=200){
+              this.$Message.success(res.msg);
+              this.getData(this.proxyObj);
+          }
+        
         })
         .catch((err) => {});
     },
@@ -298,6 +301,9 @@ export default {
     handleSet(row, index, type) {
       switch (type) {
         case 1:
+          this.process_man = '';
+          this.process_start_time = '';
+          this.process_end_time = '';
           this.processModal = true;
           this.order_no = row.order_no;
           // this.$Modal.confirm({
@@ -457,7 +463,7 @@ export default {
           serverName: "mobile",
         },
         {
-          title: "订单状态",
+          title: "拆单状态",
           name: "Select",
           placeholder: "请选择",
           serverName: "state",

src/views/MeasurementOrderMannage/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <Toptitle
       ref="toptitle"
-      :title="this.$route.query.editType == 0 ? '编辑订单' : '查看订单'"
+      :title="this.$route.query.editType == 0 ? '编辑订单' : '查看订单详情'"
     >
       <Button
         @click="handleGoDeOrder"
@@ -148,17 +148,37 @@ export default {
           option: [],
         },
         {
-          title: "测量状态",
+          title: "产品",
           name: "Select",
-          serverName: "measurement_state",
+          multiple: true,
+          filterable: true,
+          serverName: "number_detail",
+          placeholder: "请选择",
+          value: "",
+          option: [],
+        },
+        {
+          title: "图号",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          serverName: "number_detail",
           placeholder: "请选择",
           value: "",
-          option: [
-            { label: "全部", value: 99 },
-            { label: "测量中", value: 2 },
-            { label: "测量完成", value: 3 },
-          ],
+          option: [],
         },
+        // {
+        //   title: "测量状态",
+        //   name: "Select",
+        //   serverName: "measurement_state",
+        //   placeholder: "请选择",
+        //   value: "",
+        //   option: [
+        //     { label: "全部", value: 99 },
+        //     { label: "测量中", value: 2 },
+        //     { label: "测量完成", value: 3 },
+        //   ],
+        // },
       ],
       type: 1,
       logList: [{ title: "系统单号", value: "10998765" }],
@@ -183,46 +203,46 @@ export default {
           key: "product_title",
           minWidth: 200,
         },
-        {
-          title: "状态",
-          align: "center",
-          minWidth: 100,
-          render: (h, params) =>
-            h("span", {}, params.row.is_measure == 1 ? "已确认" : "未确认"),
-        },
-        {
-          title: "测量状态",
-          align: "center",
-          key: "measurement_state",
-          minWidth: 100,
-          render: (h, params) =>
-            h(
-              "span",
-              {},
-              params.row.is_measure == 1
-                ? "测量完成"
-                : params.row.measurement_state >= 3
-                ? "测量完成"
-                : params.row.measurement_state == 1
-                ? "已下测量"
-                : params.row.measurement_state == 2
-                ? "测量中"
-                : "未下测量"
-            ),
-        },
         { title: "产品型号", align: "center", key: "model", minWidth: 150 },
         { title: "单位", align: "center", key: "unit", minWidth: 130 },
         { title: "图号", align: "center", minWidth: 130, key: "url_number" },
         { title: "图纸", align: "center", slot: "up-load", minWidth: 130 },
         { title: "位置", align: "center", minWidth: 200, key: "position" },
-        {
-          title: "预估产品工期",
-          align: "center",
-          minWidth: 200,
-          key: "predict_working",
-          render: (h, params) =>
-            h("span", `${(params.row.predict_working / 8).toFixed(1)}天`),
-        },
+        // {
+        //   title: "状态",
+        //   align: "center",
+        //   minWidth: 100,
+        //   render: (h, params) =>
+        //     h("span", {}, params.row.is_measure == 1 ? "已确认" : "未确认"),
+        // },
+        // {
+        //   title: "测量状态",
+        //   align: "center",
+        //   key: "measurement_state",
+        //   minWidth: 100,
+        //   render: (h, params) =>
+        //     h(
+        //       "span",
+        //       {},
+        //       params.row.is_measure == 1
+        //         ? "测量完成"
+        //         : params.row.measurement_state >= 3
+        //         ? "测量完成"
+        //         : params.row.measurement_state == 1
+        //         ? "已下测量"
+        //         : params.row.measurement_state == 2
+        //         ? "测量中"
+        //         : "未下测量"
+        //     ),
+        // },
+        // {
+        //   title: "预估产品工期",
+        //   align: "center",
+        //   minWidth: 200,
+        //   key: "predict_working",
+        //   render: (h, params) =>
+        //     h("span", `${(params.row.predict_working / 8).toFixed(1)}天`),
+        // },
         {
           title: "测量数据",
           align: "center",
@@ -364,14 +384,14 @@ export default {
         this.logList = res.data.detail;
         this.tableTop = res.data.top;
         this.total = res.data.total;
-        res.data.top.map((v) => {
-          v.width = 200;
-          v.slot = v.key;
-          const n = this.tableColums.filter((x) => x.key == v.key);
-          if (n.length < 1) {
-            this.tableColums.splice(5, 0, v);
-          }
-        });
+        // res.data.top.map((v) => {
+        //   v.width = 200;
+        //   v.slot = v.key;
+        //   const n = this.tableColums.filter((x) => x.key == v.key);
+        //   if (n.length < 1) {
+        //     this.tableColums.splice(5, 0, v);
+        //   }
+        // });
       });
     },
     successUpload(event) {

src/views/PurchasingManage/ArrivalOrder/edit.vue

@@ -703,7 +703,7 @@ export default {
     postData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))
       obj.crt_time = new Date(obj.crt_time).getTime() / 1000 || ''
-      obj.arrive_time = new Date(obj.arrive_time).getTime() || ''
+      obj.arrive_time = new Date(obj.arrive_time).getTime() / 1000|| ''
       if (this.$route.query.purchase_order_arrive_no == '') {
         // 新增
         this.axios({

src/views/PurchasingManage/ArrivalOrder/list.vue

@@ -56,11 +56,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />
@@ -167,7 +167,7 @@ export default {
           title: '审批状态', key: 'state', align: 'center', minWidth: 140,
           render: (h, params) => {
             const { row } = params
-            const text = row.state == 0 ? '未审核' : row.state == 1 ? '审核中' : row.state == 2 ? '已审核' : '驳回'
+            const text = row.state == 0 ? '未提交' : row.state == 1 ? '审核中' : row.state == 2 ? '通过' : '驳回'
             return h('span', {}, text)
           }
         },

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -111,7 +111,7 @@
     <div class="content_table">
       <div class="content_table_btn">
         <div>
-          <span>请购清单</span>
+          <span>入库清单</span>
           <Button @click="showModal=true"
                   type="primary"
                   size="small"

src/views/PurchasingManage/InstockOrder/list.vue

@@ -68,11 +68,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />
@@ -184,7 +184,7 @@ export default {
           title: '审批状态', key: 'state', align: 'center', minWidth: 140,
           render: (h, params) => {
             const { row } = params
-            const text = row.state == 0 ? '未审核' : row.state == 1 ? '审核中' : row.state == 2 ? '已审核' : '驳回'
+            const text = row.state == 0 ? '未提交' : row.state == 1 ? '审核中' : row.state == 2 ? '通过' : '驳回'
             return h('span', {}, text)
           }
         },

src/views/PurchasingManage/OutstockOrder/list.vue

@@ -68,11 +68,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />
@@ -184,7 +184,7 @@ export default {
           title: '审批状态', key: 'state', align: 'center', minWidth: 140,
           render: (h, params) => {
             const { row } = params
-            const text = row.state == 0 ? '未审核' : row.state == 1 ? '审核中' : row.state == 2 ? '已审核' : '驳回'
+            const text = row.state == 0 ? '未提交' : row.state == 1 ? '审核中' : row.state == 2 ? '通过' : '驳回'
             return h('span', {}, text)
           }
         },

src/views/PurchasingManage/PurchasingOrder/list.vue

@@ -77,11 +77,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />

src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -68,11 +68,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />
@@ -174,7 +174,7 @@ export default {
           title: '审批状态', key: 'state', align: 'center', minWidth: 140,
           render: (h, params) => {
             const { row } = params
-            const text = row.state == 0 ? '未审核' : row.state == 1 ? '审核中' : row.state == 2 ? '已审核' : '驳回'
+            const text = row.state == 0 ? '未提交' : row.state == 1 ? '审核中' : row.state == 2 ? '通过' : '驳回'
             return h('span', {}, text)
           }
         },

src/views/PurchasingManage/RequisitionOrder/list.vue

@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div class="requisition_order">
     <Toptitle title="请购列表">
       <slot name="titleButton">
@@ -59,11 +59,11 @@
                   size="small"
                   clearable
                   style="width: 150px">
-            <Option label='未审核'
+            <Option label='未提交'
                     :value=0 />
             <Option label='审核中'
                     :value=1 />
-            <Option label='已审核'
+            <Option label='通过'
                     :value=2 />
             <Option label='驳回'
                     :value=3 />
@@ -178,10 +178,10 @@ export default {
         },
         { title: '提交人', key: 'nickname', align: 'center', minWidth: 140 },
         {
-          title: '审核状态', key: 'state', align: 'center', minWidth: 140,
+          title: '审批状态', key: 'state', align: 'center', minWidth: 140,
           render: (h, params) => {
             const { row } = params
-            const text = row.state == 0 ? '未审核' : row.state == 1 ? '审核中' : row.state == 2 ? '已审核' : '驳回'
+            const text = row.state == 0 ? '未提交' : row.state == 1 ? '审核中' : row.state == 2 ? '通过' : '驳回'
             return h('span', {}, text)
           }
         },