rev:wql改造

lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue

@@ -106,6 +106,16 @@
         >
           称重
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          @click="print"
+        >
+          打印
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -194,12 +204,12 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="重量">
+              <el-form-item label="重量" prop="productin_qty">
                 <el-input v-model="form.productin_qty" style="width: 250px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="车号">
+              <el-form-item label="车号" prop="agvno">
                 <el-input v-model="form.agvno" style="width: 250px;" />
               </el-form-item>
             </el-col>
@@ -207,8 +217,8 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="备注">
-                <el-input v-model="form.remark" style="width: 250px;" />
+              <el-form-item label="批次号" prop="pscn">
+                <el-input v-model="form.pscn" style="width: 250px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -247,6 +257,7 @@
         <el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
         <el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
         <el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
+        <el-table-column prop="pscn" label="批次号" :min-width="flexWidth('pscn',crud.data,'批次号')" />
         <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
         <el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />
         <el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot" />
@@ -256,8 +267,8 @@
             <udOperation
               :data="scope.row"
               :permission="permission"
-              :disabled-dle="scope.row.status !== '01'"
-              :disabled-edit="scope.row.status !== '01'"
+              :disabled-dle="scope.row.status !== '00'"
+              :disabled-edit="scope.row.status !== '00'"
             />
           </template>
         </el-table-column>
@@ -305,7 +316,8 @@ const defaultForm = {
   update_optid: null,
   update_optname: null,
   update_time: null,
-  is_delete: null
+  is_delete: null,
+  pscn: null
 }
 export default {
   name: 'Rawfoilworkorder',
@@ -359,6 +371,9 @@ export default {
         ],
         p_coiler_date: [
           { required: true, message: '上卷开始时间不能为空', trigger: 'blur' }
+        ],
+        pscn: [
+          { required: true, message: '批次号不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -404,6 +419,17 @@ export default {
         this.form.product_name = row.material_code
         this.form.description = row.material_name
     },
+    print() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudRawfoilworkorder.print(_selectData).then(res => {
+        this.crud.notify('打印成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
     weigh() {
       const _selectData = this.$refs.table.selection
       this.openParam = _selectData[0]

lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder.js

@@ -24,6 +24,14 @@ export function edit(data) {
   })
 }
 
+export function print(data) {
+  return request({
+    url: '/api/rawfoilworkorder/print',
+    method: 'post',
+    data
+  })
+}
+
 export function compelEnd(data) {
   return request({
     url: 'api/rawfoilworkorder/compelEnd',
@@ -40,4 +48,4 @@ export function confirm(data) {
   })
 }
 
-export default { add, edit, del, compelEnd, confirm }
+export default { add, edit, del, compelEnd, confirm, print }

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -321,6 +321,16 @@
         >
           设置右卷
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          @click="print"
+        >
+          打印
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="1200px">
@@ -1070,6 +1080,17 @@ export default {
     cancel(row, index) {
       row.show_edit = '0'
     },
+    print() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudSlittingproductionplan.print(_selectData).then(res => {
+        this.crud.notify('打印成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
     save(row, index) {
       row.show_edit = '0'
       crudSlittingproductionplan.updates(row).then(res => {

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js

@@ -78,5 +78,12 @@ export function updates(data) {
     data
   })
 }
+export function print(data) {
+  return request({
+    url: '/api/slittingproductionplan/print',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del, upMaterFinish, caseFinish, sendFinish, inFinish, compelFinish, setDirection, updates }
+export default { add, edit, del, upMaterFinish, caseFinish, sendFinish, inFinish, compelFinish, setDirection, updates, print }