lilei 2 dienas atpakaļ
vecāks
revīzija
7828f5a9cb

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

@@ -40,6 +40,13 @@
             </a-select-option>
           </a-select>
         </a-form-model-item>
+        <a-form-model-item label="促销产品" prop="giftPrintType" v-if="nowType=='print'">
+          <a-radio-group v-model="form.giftPrintType">
+            <a-radio value="2">包含</a-radio>
+            <a-radio value="0">不包含</a-radio>
+            <a-radio value="1">仅有</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="dispDet.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
@@ -113,6 +120,7 @@ export default {
       form: { // 打印、导出选项
         id: 'all',
         orderBy: undefined,
+        giftPrintType: undefined,
         origCode: '0',
         packNo: '1'
       },
@@ -121,7 +129,8 @@ export default {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
         origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }],
-        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }]
+        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }],
+        giftPrintType: [{ required: true, message: '请选择促销产品', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -153,6 +162,7 @@ export default {
             }
             obj.origCode = _this.form.origCode
             obj.packNo = _this.form.packNo
+            obj.giftPrintType = _this.form.giftPrintType
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false
@@ -170,6 +180,7 @@ export default {
       this.form.orderBy = undefined
       this.form.origCode = '0'
       this.form.packNo = '1'
+      this.form.giftPrintType = undefined
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

+ 12 - 1
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -40,6 +40,13 @@
             </a-select-option>
           </a-select>
         </a-form-model-item>
+        <a-form-model-item label="促销产品" prop="giftPrintType" v-if="nowType=='print'">
+          <a-radio-group v-model="form.giftPrintType">
+            <a-radio value="2">包含</a-radio>
+            <a-radio value="0">不包含</a-radio>
+            <a-radio value="1">仅有</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="dispDet.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
@@ -107,6 +114,7 @@ export default {
       form: {
         id: 'all',
         orderBy: undefined,
+        giftPrintType: undefined,
         origCode: '0',
         packNo: '1'
       },
@@ -114,7 +122,8 @@ export default {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
         origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }],
-        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }]
+        packNo: [{ required: true, message: '请选择装箱号', trigger: 'change' }],
+        giftPrintType: [{ required: true, message: '请选择促销产品', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -146,6 +155,7 @@ export default {
             }
             obj.origCode = _this.form.origCode
             obj.packNo = _this.form.packNo
+            obj.giftPrintType = _this.form.giftPrintType
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false
@@ -162,6 +172,7 @@ export default {
       this.form.id = 'all'
       this.form.orderBy = undefined
       this.form.packNo = '1'
+      this.form.giftPrintType = undefined
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {