31

src/views/ProductionOrderList/InboundForm/details.vue

@@ -97,7 +97,7 @@
           class="map-margin"
           v-if="row.in_out_value !== 1"
           @click="outShip(row, 3)"
-          >确认出库</a
+          >包装完成</a
         >
         <a
           class="map-margin"
@@ -108,7 +108,7 @@
       <Modal
         class-name="vertical-center-modal"
         width="400"
-        title="确认出库"
+        title="发货指令"
         v-model="showStock"
         @on-ok="confirmOutStock"
       >
@@ -558,8 +558,8 @@ export default {
       }
       params = Array.isArray(row) ? row.join(",") : row.orders_procedure_id;
       this.confirmDelete({
-        title: "确认入库",
-        content: "确认入库？",
+        title: "包装完成",
+        content: "是否确认包装完成",
         type: "primary",
         then: () => {
           this.axios
@@ -572,14 +572,14 @@ export default {
             });
         },
         cancel: () => {
-          this.$Message.warning("您取消了确认入库操作");
+          this.$Message.warning("您取消了包装完成操作");
         },
       });
     },
     outStock(row) {
       console.log("row :>> ", row);
       if (!row || row.length < 1) {
-        return this.$Message.error("您未选择或者未确认入库");
+        return this.$Message.error("您未选择或者未确认包装完成");
       }
       this.info.order_in_no = Array.isArray(row)
         ? row.join(",")
@@ -609,8 +609,8 @@ export default {
       //type 1出库  2运输
       if (type == 3) {
         this.confirmDelete({
-          title: "确认出库",
-          content: "确认出库么？",
+          title: "包装完成",
+          content: "是否确认包装完成",
           type: "primary",
           then: (e) => {
             this.axios
@@ -634,8 +634,8 @@ export default {
         let params = {};
         params.id = id;
         this.confirmDelete({
-          title: type == 1 ? "确认出库" : "确认运输",
-          content: type == 1 ? "确认出库么？" : "确认运输么",
+          title: type == 1 ? "包装完成" : "发货指令",
+          content: type == 1 ? "是否确认包装完成" : "确认发布发货指令",
           type: "primary",
           then: (e) => {
             this.axios.post(post_url, params).then((res) => {

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -5,7 +5,7 @@
       :list="list"
       @init="init"
       :logList="logList"
-      @searchData="init"
+      @searchData="search"
       @changePage="changePage"
       @changeSize="changeSize"
       @selectTable="selectTable"
@@ -141,6 +141,14 @@ export default {
           placeholder: "请选择图号",
           option: [],
         },
+         {
+          title: "派工状态",
+          name: "Select",       
+          serverName: "state",
+          placeholder: "请选择单元",
+          value: "",
+          option: [{ label: '未派工', value: 0 },{ label: '已派工', value: 1 }],
+        },
       ],
       tableColums: [
         { type: "selection", align: "center", fixed: "left", width: "100" },
@@ -274,6 +282,41 @@ export default {
     init(row) {
       this.pageIndex = 1;
       row.page_index = this.pageIndex;
+      row.state = 0;
+      this.list[8].value = 0;
+      row.page_size = this.pageSize;
+      this.order_no = this.$route.query.order_no;
+      Object.assign(row, this.$route.query);
+      if (this.func.isType(row.house) == "Array") {
+        row.house = row.house.join(",");
+      }
+      if (this.func.isType(row.unit) == "Array") {
+        row.unit = row.unit.join(",");
+      }
+      if (this.func.isType(row.layer) == "Array") {
+        row.layer = row.layer.join(",");
+      }
+      if (this.func.isType(row.number_detail) == "Array") {
+        row.number_detail = row.number_detail.join(",");
+      }
+      if (this.func.isType(row.part) == "Array") {
+        row.part = row.part.join(",");
+      }
+      if (this.func.isType(row.produce) == "Array") {
+        row.produce = row.produce.join(",");
+      }
+      if (this.func.isType(row.product) == "Array") {
+        row.product = row.product.join(",");
+      }
+      if (this.func.isType(row.img_number) == "Array") {
+        row.img_number = row.img_number.join(",");
+      }
+      this.proxyObj = row;
+      this.getData(row);
+    },
+     search(row) {
+      this.pageIndex = 1;
+      row.page_index = this.pageIndex;
       row.page_size = this.pageSize;
       this.order_no = this.$route.query.order_no;
       Object.assign(row, this.$route.query);

src/views/Warehouse/FirstInventory/detail.vue

@@ -38,7 +38,6 @@
     </div>
     <div class="warehouseList_content">
       <Table :columns="tableColums"
-             max-height="570"
              :data="tableData"
              border>
         <template slot='set'
@@ -136,19 +135,19 @@ export default {
         end_time: null,
       },
       tableColums: [
-        { title: '物料分类', align: 'center', key: 'material_type_title', minWidth: 120 },
-        { title: '物料名称', align: 'center', key: 'material_title', minWidth: 100 },
+        { title: '物料分类', align: 'center', key: 'material_type_title', resizable:true,width: 200 },
+        { title: '物料名称', align: 'center', key: 'material_title',resizable:true,width: 200 },
         {
-          title: '规格型号', align: 'center', key: 'renovation_type', minWidth: 200,
+          title: '规格型号', align: 'center', key: 'renovation_type',resizable:true,width: 200,
           render: (h, params) => {
             const { row } = params
             let text = `L${row.long}*W${row.width}*H${row.high}`
             return h('span', {}, text)
           }
         },
-        { title: '计量单位', align: 'center', key: 'unit', minWidth: 120 },
+        { title: '计量单位', align: 'center', key: 'unit', resizable:true,width: 120 },
         {
-          title: '数量', align: 'center', key: 'num', minWidth: 100,
+          title: '数量', align: 'center', key: 'num', resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -168,7 +167,7 @@ export default {
           }
         },
         {
-          title: '单价', align: 'center', key: 'price', minWidth: 100,
+          title: '单价', align: 'center', key: 'price',resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -188,7 +187,7 @@ export default {
           }
         },
         {
-          title: '金额', align: 'center', key: 'total_price', minWidth: 100,
+          title: '金额', align: 'center', key: 'total_price', resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -207,7 +206,7 @@ export default {
             })
           }
         },
-        { title: '操作', align: 'center', key: 'set', slot: 'set', fixed: 'right', minWidth: 100 },
+        { title: '操作', align: 'center', key: 'set', slot: 'set', minWidth: 100 },
       ],
       tableData: [],
       page_index: 1,