lilei 1 年之前
父节点
当前提交
5d00325c27

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1688522370731
+  "version": 1689219590984
 }

+ 1 - 1
src/api/sales.js

@@ -134,7 +134,7 @@ export const supperCodeByVin = (params) => {
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const data = {
-    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}/${params.remarksShowFlag}`,
+    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}/${params.remarksShowFlag}/${params.priceFlag}`,
     method: 'get'
   }
   // 喷墨打印

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -233,7 +233,7 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0, priceFlag: 0 }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -344,7 +344,7 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0, priceFlag: 0 }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }

+ 13 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -20,6 +20,7 @@
               <div style="padding:10px;" slot="extendCons">
                 <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
                 <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
+                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
                 <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
               </div>
             </PrintPanel>
@@ -155,6 +156,7 @@ export default {
       printOrgCode: false, // 打印原创编码
       printAllName: false, // 打印全部名称
       printRemarks: false,
+      printPrice: false,
       showOutInModal: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -240,7 +242,13 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: this.printRemarks ? 1 : 0 }
+      const params = { 
+        sn: this.outBizSn || this.$route.params.sn, 
+        printOrgCode: this.printOrgCode ? 1 : 0, 
+        printAllName: this.printAllName ? 1 : 0, 
+        remarksShowFlag: this.printRemarks ? 1 : 0,
+        priceFlag: this.printPrice ? 1 : 0
+      }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }
@@ -282,6 +290,7 @@ export default {
         vm.printOrgCode = localStorage.getItem('printOrgCode-' + this.$store.state.user.info.orgId) == 'true'
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
         vm.$refs.table.refresh(true)
         vm.getDetail()
       })
@@ -294,6 +303,9 @@ export default {
     printRemarks (newValue, oldValue) {
       localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
     },
+    printPrice (newValue, oldValue) {
+      localStorage.setItem('printPrice-' + this.$store.state.user.info.orgId, newValue)
+    },
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     }

+ 13 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -25,6 +25,7 @@
             <div style="padding:10px;" slot="extendCons">
               <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
               <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
+              <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
               <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
             </div>
           </PrintPanel>
@@ -372,6 +373,7 @@ export default {
       printOrgCode: false, // 打印原创编码
       printAllName: false, // 打印全部名称
       printRemarks: false, // 打印备注
+      printPrice: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -462,7 +464,13 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: this.printRemarks ? 1 : 0 }
+      const params = { 
+        sn: this.outBizSn || this.$route.params.sn, 
+        printOrgCode: this.printOrgCode ? 1 : 0, 
+        printAllName: this.printAllName ? 1 : 0, 
+        remarksShowFlag: this.printRemarks ? 1 : 0,
+        priceFlag: this.printPrice ? 1 : 0
+      }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }
@@ -897,6 +905,7 @@ export default {
         vm.printOrgCode = localStorage.getItem('printOrgCode-' + this.$store.state.user.info.orgId) == 'true'
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
         vm.getOrderDetail(true)
       })
     }
@@ -908,6 +917,9 @@ export default {
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     },
+    printPrice (newValue, oldValue) {
+      localStorage.setItem('printPrice-' + this.$store.state.user.info.orgId, newValue)
+    },
     printRemarks (newValue, oldValue) {
       localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
     },

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.111/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,