优化

mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue

@@ -137,6 +137,7 @@ const defaultForm = {
   pcsn:'',
   org_id:'',
   status: '10',
+  create_mode: '01',
   product_series_id:'',
   workorder_qty: '500',
   workorder_type: '01',

mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue

@@ -169,6 +169,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="生成方式" prop="create_mode">
+        <el-select
+          v-model="form.create_mode"
+          placeholder=""
+          style="width: 210px"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.ST_CREATE_MODE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="出粉率" prop="product_rate">
         <label slot="label">出粉率(%):</label>
         <el-input v-model="form.product_rate" style="width: 210px"  disabled />
@@ -246,7 +262,7 @@ export default {
       type: Object
     }
   },
-  dicts: ['workorder_status', 'workorder_type', 'product_series', 'finish_type'],
+  dicts: ['workorder_status', 'workorder_type', 'product_series', 'finish_type', 'ST_CREATE_MODE'],
   data() {
     return {
       dialogVisible: false,

mes/qd/src/views/wms/pdm/produce/workorder/index.vue

@@ -76,7 +76,23 @@
               />
             </el-select>
           </el-form-item>
-
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属组织">
             <el-select
               v-model="query.org_id"
@@ -245,6 +261,7 @@
         <el-table-column   min-width="100" prop="source_bill_type"  :formatter="workorder_typeFormat2" label="源类型" />
         <el-table-column prop="source_bill_code" label="来源单据编号" min-width="100" />
         <el-table-column min-width="90" prop="workprocedure_id" label="当前工序" :formatter="seriesFormat2" />
+        <el-table-column  :formatter="create_modeFormat" min-width="170" prop="create_mode" label="生成方式" />
         <el-table-column prop="startwork_name" min-width="80" label="开工人"/>
         <el-table-column prop="endwork_name" min-width="80" label="完工人"/>
         <el-table-column prop="create_name" min-width="80" label="创建人"/>
@@ -292,7 +309,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['workorder_status', 'workorder_type', 'product_series', 'workorder_type2'],
+  dicts: ['workorder_status', 'workorder_type', 'product_series', 'workorder_type2', 'ST_CREATE_MODE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -392,6 +409,9 @@ export default {
     stateFormat(row) {
       return this.dict.label.workorder_status[row.status]
     },
+    create_modeFormat(row) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
     bill_typeFormat(row) {
       return this.dict.label.workorder_type[row.workorder_type]
     },

mes/qd/src/views/wms/pf/initformula/index.vue

@@ -75,6 +75,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="批次">
             <el-input
               v-model="query.pcsn"
@@ -136,6 +153,7 @@
         <el-table-column prop="pcsn" min-width="130" label="批次"/>
         <el-table-column prop="workorder_qty" min-width="100" label="重量" :formatter="crud.formatNum3"/>
         <el-table-column prop="bill_qty" min-width="100" label="开单总重量" :formatter="crud.formatNum3" />
+        <el-table-column  :formatter="create_modeFormat" min-width="170" prop="create_mode" label="生成方式" />
         <el-table-column prop="qty_unit_name" min-width="100" label="单位"/>
         <el-table-column prop="formula_time" min-width="150" label="开单时间"/>
         <el-table-column prop="formula_name" min-width="150" label="开单人"/>
@@ -176,7 +194,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['workorder_status', 'workorder_type', 'product_series'],
+  dicts: ['workorder_status', 'workorder_type', 'product_series', 'ST_CREATE_MODE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -279,6 +297,9 @@ export default {
         this.changeShow = true
       })
     },
+    create_modeFormat(row) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
     autoAll(){
       this.checkrows = this.$refs.table.selection
       autoformula.autoAll({rows:this.checkrows}).then(res => {