lilei 1 年之前
父节点
当前提交
c5d3e31dd4

+ 4 - 0
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -279,6 +279,10 @@ export default {
         if(obj.origCode == 1){
           params.type = params.type + '_ORIG_CODE'
         }
+        // 装箱号
+        if(obj.packNo == 1){
+          params.type = params.type + '_PACK_NUM'
+        }
         printFun(
           dispatchDetailPrint,
           Object.assign(params, obj || {}),

+ 12 - 2
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -53,6 +53,12 @@
             <a-radio value="0">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="装箱号" prop="packNo" v-if="nowType=='print'">
+          <a-radio-group v-model="form.packNo">
+            <a-radio value="1">打印</a-radio>
+            <a-radio value="0">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="pushOrderManagement-print-back" @click="handleCancel">取消</a-button>
@@ -107,12 +113,14 @@ export default {
       form: {
         id: 'all',
         orderBy: undefined,
-        origCode: '0'
+        origCode: '0',
+        packNo: '0'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
-        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }],
+        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -143,6 +151,7 @@ export default {
               obj.orderBy = _this.form.orderBy
             }
             obj.origCode = _this.form.origCode
+            obj.packNo = _this.form.packNo
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false
@@ -159,6 +168,7 @@ export default {
       this.form.id = 'all'
       this.form.orderBy = undefined
       this.form.origCode = '0'
+      this.form.packNo = '0'
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

+ 4 - 0
src/views/salesManagement/stockPrint/list.vue

@@ -357,6 +357,10 @@ export default {
       if(obj.origCode == 1){
         params.type = params.type + '_ORIG_CODE'
       }
+      // 装箱号
+      if(obj.packNo == 1){
+        params.type = params.type + '_PACK_NUM'
+      }
       _this.spinning = true
       printFun(
         dispatchDetailPrint,

+ 11 - 2
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -53,6 +53,12 @@
             <a-radio value="0">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="装箱号" prop="packNo" v-if="nowType=='print'">
+          <a-radio-group v-model="form.packNo">
+            <a-radio value="1">打印</a-radio>
+            <a-radio value="0">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="pushOrderManagement-print-back" @click="handleCancel">取消</a-button>
@@ -101,12 +107,14 @@ export default {
       form: {
         id: 'all',
         orderBy: undefined,
-        origCode: undefined
+        origCode: '0',
+        packNo: '0'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
-        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }],
+        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -137,6 +145,7 @@ export default {
               obj.orderBy = _this.form.orderBy
             }
             obj.origCode = _this.form.origCode
+            obj.packNo = _this.form.packNo
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,