Browse Source

Merge branch 'develop_yh18' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh18

chenrui 2 năm trước cách đây
mục cha
commit
0f4cbcb188

+ 1 - 1
public/version.json

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

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

@@ -24,6 +24,7 @@
             <div style="padding:10px;" slot="extendCons">
             <div style="padding:10px;" slot="extendCons">
               <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
               <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="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
+              <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
             </div>
             </div>
           </PrintPanel>
           </PrintPanel>
           <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
           <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
@@ -369,6 +370,7 @@ export default {
       tbForm: [], // 同步操作
       tbForm: [], // 同步操作
       printOrgCode: false, // 打印原创编码
       printOrgCode: false, // 打印原创编码
       printAllName: false, // 打印全部名称
       printAllName: false, // 打印全部名称
+      printRemarks: false, // 打印备注
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
@@ -459,7 +461,7 @@ export default {
       const _this = this
       const _this = this
       _this.spinning = true
       _this.spinning = true
       let url = salesDetailPrint
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, printRemarks: this.printRemarks ? 1 : 0 }
       if (type == 'export') { //  导出
       if (type == 'export') { //  导出
         url = salesDetailExport
         url = salesDetailExport
       }
       }
@@ -893,6 +895,7 @@ export default {
         // 是否默认打印原厂编码
         // 是否默认打印原厂编码
         vm.printOrgCode = localStorage.getItem('printOrgCode-' + this.$store.state.user.info.orgId) == 'true'
         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.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.getOrderDetail(true)
         vm.getOrderDetail(true)
       })
       })
     }
     }
@@ -904,6 +907,9 @@ export default {
     printAllName (newValue, oldValue) {
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     },
     },
+    printRemarks (newValue, oldValue) {
+      localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
+    },
     showSearch (newValue, oldValue) {
     showSearch (newValue, oldValue) {
       this.setTableH()
       this.setTableH()
     },
     },