ysy пре 1 година
родитељ
комит
803174b4d7

+ 158 - 153
src/components/CreatePlan/ProductionVersion2.vue

@@ -1,23 +1,35 @@
 <template>
-  <el-dialog title="选择工艺路线" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="true"
-    :close-on-press-escape="false" append-to-body width="80%">
+  <el-dialog
+    title="选择工艺路线"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :close-on-click-modal="true"
+    :close-on-press-escape="false"
+    append-to-body
+    width="80%"
+  >
     <el-card shadow="never">
-      <productionSearch   @search="reload"></productionSearch>
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource" height="calc(100vh - 350px)"
-        class="dict-table" @cell-click="cellClick">
+      <productionSearch @search="reload"></productionSearch>
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        height="calc(100vh - 350px)"
+        class="dict-table"
+        @cell-click="cellClick"
+      >
         <!-- 表头工具栏 -->
 
-        
-
         <template v-slot:status="{ row }">
           {{ checkStatus(row) }}
         </template>
 
         <template v-slot:action="{ row }">
-          <el-radio class="radio" v-model="radio" :label="row.id"><i></i></el-radio>
+          <el-radio class="radio" v-model="radio" :label="row.id"
+            ><i></i
+          ></el-radio>
         </template>
       </ele-pro-table>
-
     </el-card>
     <div class="btns">
       <el-button type="primary" size="small" @click="selected">选择</el-button>
@@ -27,160 +39,153 @@
 </template>
 
 <script>
-
-
-import { routeList } from '@/api/saleOrder';
-import productionSearch from './production-search.vue'
-export default {
-  components: { 
-    productionSearch
-    },
-  data() {
-    return {
-      visible: false,
-      // 表格列配置
-      columns: [
-        {
-          prop: 'code',
-          label: '工艺路线组编码',
-          // sortable: 'custom',
-          showOverflowTooltip: true,
-          align: 'center',
-
-          minWidth: 110
-        },
-        {
-          prop: 'name',
-          label: '工艺路线名称',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
-
-
-        {
-          prop: 'version',
-          label: '工艺路线版本',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-
-        {
-          prop: 'produceVersionName',
-          label: '生产版本',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-
-        {
-          prop: 'status',
-          label: '状态',
-          align: 'center',
-          slot: 'status',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-
-        {
-          action: 'action',
-          slot: 'action',
-          align: 'center',
-          label: '选择'
-        }
-      ],
-      statusList: [
-        { label: '草稿', value: -1 },
-        { label: '失效', value: 0 },
-        { label: '生效', value: 1 }
-      ],
-      categoryLevelId: '9',
-      radio: null
-    }
-  },
-
-  watch: {
-
-  },
-  methods: {
-
-    checkStatus(row) {
-      let obj = this.statusList.find((it) => it.value == row.status);
-      return obj.label;
+  import { routeList } from '@/api/saleOrder';
+  import productionSearch from './production-search.vue';
+  export default {
+    components: {
+      productionSearch
     },
-    /* 表格数据源 */
-    datasource({ page, where, limit }) {
-      return routeList({
-        ...where,
-        pageNum: page,
-        size: limit,
-  
-      });
+    data() {
+      return {
+        visible: false,
+        // 表格列配置
+        columns: [
+          {
+            prop: 'code',
+            label: '工艺路线组编码',
+            // sortable: 'custom',
+            showOverflowTooltip: true,
+            align: 'center',
+
+            minWidth: 110
+          },
+          {
+            prop: 'name',
+            label: '工艺路线名称',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 110
+          },
+
+          {
+            prop: 'version',
+            label: '工艺路线版本',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
+          {
+            prop: 'produceVersionName',
+            label: '生产版本',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            slot: 'status',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
+          {
+            action: 'action',
+            slot: 'action',
+            align: 'center',
+            label: '选择'
+          }
+        ],
+        statusList: [
+          { label: '草稿', value: -1 },
+          { label: '失效', value: 0 },
+          { label: '生效', value: 1 }
+        ],
+        categoryLevelId: '9',
+        radio: null
+      };
     },
 
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where: where });
-    },
-    open(item) {
-      if (item) {
-        this.current = {
-          id: item.id,
-          name: item.name,
+    watch: {},
+    methods: {
+      checkStatus(row) {
+        let obj = this.statusList.find((it) => it.value == row.status);
+        return obj.label;
+      },
+      /* 表格数据源 */
+      datasource({ page, where, limit }) {
+        return routeList({
+          ...where,
+          status: 1,
+          pageNum: page,
+          size: limit
+        });
+      },
+
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where: where });
+      },
+      open(item) {
+        if (item) {
+          this.current = {
+            id: item.id,
+            name: item.name
+          };
+          this.radio = item.id;
         }
-        this.radio = item.id
-      }
-      this.visible = true
-    },
-    // 单击获取id
-    cellClick (row) {
-        this.current = row
-        this.radio = row.id
-    },
-
-    handleClose() {
-      this.visible = false
- 
-    },
-    selected() {
-      if (!this.current) {
-        return this.$message.warning('请选择工艺路线')
+        this.visible = true;
+      },
+      // 单击获取id
+      cellClick(row) {
+        this.current = row;
+        this.radio = row.id;
+      },
+
+      handleClose() {
+        this.visible = false;
+      },
+      selected() {
+        if (!this.current) {
+          return this.$message.warning('请选择工艺路线');
+        }
+        this.$emit('changeProduct', this.current);
+        this.handleClose();
       }
-      this.$emit('changeProduct', this.current)
-      this.handleClose()
-    },
-  }
-}
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.tree_col {
-  border: 1px solid #eee;
-  padding: 10px 0;
-  box-sizing: border-box;
-  height: 500px;
-  overflow: auto;
-}
-
-.table_col {
-  padding-left: 10px;
-
-  ::v-deep .el-table th.el-table__cell {
-    background: #f2f2f2;
+  .tree_col {
+    border: 1px solid #eee;
+    padding: 10px 0;
+    box-sizing: border-box;
+    height: 500px;
+    overflow: auto;
   }
-}
 
-.pagination {
-  text-align: right;
-  padding: 10px 0;
-}
+  .table_col {
+    padding-left: 10px;
 
-.btns {
-  text-align: center;
-  padding: 10px 0;
-}
+    ::v-deep .el-table th.el-table__cell {
+      background: #f2f2f2;
+    }
+  }
+
+  .pagination {
+    text-align: right;
+    padding: 10px 0;
+  }
 
-.topsearch {
-  margin-bottom: 15px;
-}
+  .btns {
+    text-align: center;
+    padding: 10px 0;
+  }
+
+  .topsearch {
+    margin-bottom: 15px;
+  }
 </style>

+ 1 - 1
src/views/materialPlan/components/plan-edit-dialog.vue

@@ -353,7 +353,7 @@
           },
           {
             prop: 'contractNum',
-            label: '合同数量',
+            label: '订单数量',
             align: 'center'
           },
           {

+ 2 - 2
src/views/materialPlan/components/saleOrderPop.vue

@@ -88,12 +88,12 @@ export default {
                 },
                 {
                     prop: 'productSumWeight',
-                    label: '合同重量',
+                    label: '订单重量',
                     align: 'center'
                 },
                 {
                     prop: 'contractNum',
-                    label: '合同数量',
+                    label: '订单数量',
                     align: 'center'
                 },
 

+ 2 - 2
src/views/saleOrder/components/AdditionalOrder.vue

@@ -124,14 +124,14 @@
           },
           {
             prop: 'contractNum',
-            label: '合同数量',
+            label: '订单数量',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
             prop: 'productSumWeight',
-            label: '合同重量',
+            label: '订单重量',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110