lilei 2 gadi atpakaļ
vecāks
revīzija
63fa8df19f

+ 1 - 1
public/version.json

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

+ 1 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -63,6 +63,7 @@
               <a-col :md="4" :sm="24">
                 <a-form-item label="产品来源">
                   <a-select
+                    allowClear
                     placeholder="请选择产品来源"
                     v-model="queryParam.productSysFlag"
                   >

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

@@ -13,7 +13,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_salesPrint')">
-          <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>
           <Print :disabled="localDataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
@@ -272,6 +272,7 @@ export default {
         vm.disabled = false
         // 是否默认打印原厂编码
         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.$refs.table.refresh(true)
         vm.getDetail()
       })
@@ -280,6 +281,9 @@ export default {
   watch: {
     printOrgCode (newValue, oldValue) {
       localStorage.setItem('printOrgCode-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printAllName (newValue, oldValue) {
+      localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     }
   },
   mounted () {
@@ -295,10 +299,6 @@ export default {
       this.pageInit()
     }
   },
-  deactivated () {
-    // this.localDataSource = []
-    // this.showPage = false
-  },
   beforeRouteEnter (to, from, next) {
     next(vm => {})
   }

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

@@ -17,7 +17,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
-          <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>
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
@@ -708,6 +708,7 @@ export default {
         vm.salesBillSn = vm.$route.params.sn
         // 是否默认打印原厂编码
         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.getOrderDetail(true)
         vm.$refs.table.refresh(true)
       })
@@ -716,6 +717,9 @@ export default {
   watch: {
     printOrgCode (newValue, oldValue) {
       localStorage.setItem('printOrgCode-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printAllName (newValue, oldValue) {
+      localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     }
   },
   mounted () {