瀏覽代碼

Merge branch 'develop_temp0711' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

# Conflicts:
#	src/views/salesManagement/pushOrderManagement/exportExcelModal.vue
lilei 1 年之前
父節點
當前提交
7b558d4bee

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

@@ -275,6 +275,10 @@ export default {
         if (obj.orderBy) {
           params.type = params.type + '_STACK_PLACE'
         }
+        // 原厂编码
+        if(obj.origCode == 1){
+          params.type = params.type + '_ORIG_CODE'
+        }
         printFun(
           dispatchDetailPrint,
           Object.assign(params, obj || {}),

+ 9 - 6
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -25,10 +25,10 @@
             <a-radio value="DISPATCH_BILL">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="原厂编码" prop="priceType" v-if="$hasPermissions('B_dispatchExport_salesPrice')">
-          <a-radio-group v-model="form.priceType">
-            <a-radio value="DISPATCH_BILL_PRICE">导出</a-radio>
-            <a-radio value="DISPATCH_BILL">不导出</a-radio>
+        <a-form-model-item label="原厂编码" prop="origCode">
+          <a-radio-group v-model="form.origCode">
+            <a-radio value="1">导出</a-radio>
+            <a-radio value="0">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
@@ -58,10 +58,12 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        priceType: undefined
+        priceType: undefined,
+        origCode: undefined
       },
       rules: {
-        priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }]
+        priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -80,6 +82,7 @@ export default {
           if (!this.$hasPermissions('B_dispatchExport_salesPrice')) {
             _this.form.priceType = 'DISPATCH_BILL'
           }
+          _this.form.priceType += _this.form.origCode == 1 ? '_ORIG_CODE' : ''
           _this.$emit('ok', _this.form.priceType, {}, '下推产品')
           _this.isShow = false
         } else {

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

@@ -47,6 +47,12 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="原厂编码" prop="origCode" v-if="nowType=='print'">
+          <a-radio-group v-model="form.origCode">
+            <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>
@@ -100,11 +106,13 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: {
         id: 'all',
-        orderBy: undefined
+        orderBy: undefined,
+        origCode: undefined
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -134,6 +142,7 @@ export default {
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }
+            obj.origCode = _this.form.origCode
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false
@@ -149,6 +158,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form.id = 'all'
       this.form.orderBy = undefined
+      this.form.origCode = undefined
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

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

@@ -353,6 +353,10 @@ export default {
       if (obj.orderBy) {
         params.type = params.type + '_STACK_PLACE'
       }
+      // 原厂编码
+      if(obj.origCode == 1){
+        params.type = params.type + '_ORIG_CODE'
+      }
       _this.spinning = true
       printFun(
         dispatchDetailPrint,

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

@@ -47,6 +47,12 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="原厂编码" prop="origCode" v-if="nowType=='print'">
+          <a-radio-group v-model="form.origCode">
+            <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>
@@ -94,11 +100,13 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: {
         id: 'all',
-        orderBy: undefined
+        orderBy: undefined,
+        origCode: undefined
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -128,6 +136,7 @@ export default {
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }
+            obj.origCode = _this.form.origCode
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ 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', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {