add:刻字工序

mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue

@@ -176,7 +176,7 @@ export default {
         { key: true, display_name: '启用' },
         { key: false, display_name: '禁用' }
       ],
-      materType: '',
+      materType: '01',
       materialShow: false,
       pointMVisible: false,
       materialForm: {},

mes/qd/src/views/wms/masterdata_manage/master/material/index.vue

@@ -127,8 +127,11 @@
             </el-col>
             <el-col :span="16">
               <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1">是</el-radio>
+                <el-switch
+                  v-model="form.is_used"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -153,6 +156,7 @@
         <el-table-column prop="material_model" label="物料型号"/>
         <el-table-column prop="class_name" label="物料分类" width="140"/>
         <el-table-column prop="unit_name" label="计量单位"/>
+        <el-table-column prop="net_weight" label="单重(g)"/>
         <el-table-column prop="product_series_name" label="系列"/>
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -160,8 +164,6 @@
               v-model="scope.row.is_used"
               active-color="#409EFF"
               inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
               @change="changeEnabled(scope.row, scope.row.is_used)"
             />
           </template>
@@ -315,6 +317,9 @@ export default {
         this.classes1 = data
       })
     },
+    format_isOrNot(row, column, value) {
+      return value === true ? '是' : '否'
+    },
     initClass2() {
       const param = {
         parent_class_code: '09'
@@ -393,29 +398,29 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
+      this.$confirm('此操作将修改' + data.material_name + '状态, 是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         crudMaterialbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
+          if (data.is_used === false) {
+            data.is_used = true
             return
           }
-          if (data.is_used === '1') {
-            data.is_used = '0'
+          if (data.is_used === true) {
+            data.is_used = false
           }
         })
       }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
+        if (data.is_used === false) {
+          data.is_used = true
           return
         }
-        if (data.is_used === '1') {
-          data.is_used = '0'
+        if (data.is_used === true) {
+          data.is_used = false
         }
       })
     },

mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue

@@ -188,7 +188,6 @@ export default {
     },
     getWorkprocedure() { // 获取工序下拉框
       crudDevice.getWorkprocedure().then(res => {
-        console.log(res)
         this.workList = res
       })
     },

mes/qd/src/views/wms/product_manage/workorder/index.vue

@@ -51,6 +51,16 @@
               class="filter-item"
             />
           </el-form-item>
+          <el-form-item label="所属工序">
+            <el-select v-model="query.workprocedure_code" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
+              <el-option
+                v-for="item in workprocedureList"
+                :key="item.workprocedure_code"
+                :label="item.workprocedure_name"
+                :value="item.workprocedure_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="设备搜索">
             <el-input
               v-model="query.device_code"
@@ -111,16 +121,16 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料系列">
-            <treeselect
-              v-model="query.product_series"
-              :options="classes3"
-              :auto-load-root-options="false"
-              :load-options="loadChildNodes"
-              style="width: 200px;"
-              placeholder="请选择"
-            />
-          </el-form-item>
+<!--          <el-form-item label="物料系列">-->
+<!--            <treeselect-->
+<!--              v-model="query.product_series"-->
+<!--              :options="classes3"-->
+<!--              :auto-load-root-options="false"-->
+<!--              :load-options="loadChildNodes"-->
+<!--              style="width: 200px;"-->
+<!--              placeholder="请选择"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="订单检索">
             <el-input
               v-model="query.sale_id"
@@ -672,6 +682,7 @@ export default {
   },
   data() {
     return {
+      workprocedureList: [],
       zxj: [{ value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
       auto_confirm: [{ value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
       cxj: [{ value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
@@ -683,7 +694,6 @@ export default {
       addShow: false,
       replaceShow: false,
       uploadShow: false,
-      workprocedureList: [],
       userList: [],
       order_status: ['-1'],
       permission: {},

mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue

@@ -248,7 +248,7 @@ export default {
   data() {
     return {
       materialForm: {},
-      materType: '',
+      materType: '01',
       materialShow: false,
       dialogVisible: false,
       pointMVisible: false,

mes/qd/src/views/wms/staging_manage/staging/kzStaging/备份.vue

@@ -112,6 +112,7 @@ export default {
   mixins: [presenter(), header(), form(defaultForm)],
   data() {
     return {
+      materType:'03',
       materialShow: false,
       queryTypeOptions: [
         { key: 'name', display_name: '字典名称' },