소스 검색

Merge commit 'e9ecd5e955428bb5e746456c7e8d388f787de706' into HEAD

gitadmin 7 달 전
부모
커밋
03a8eca443

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.491",
+    "version": "2.2.492",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 5 - 3
src/views/allocationManagement/transferOut/dsModal.vue

@@ -49,7 +49,7 @@
               v-model.trim="form.explainInfo"
               placeholder="请输入发货说明(最多500个字符)"/>
           </a-form-model-item>
-          <a-form-model-item label="备货打印" prop="printState">
+          <a-form-model-item label="备货打印" prop="printState" v-if="showPrint">
             <a-radio-group id="transferOutDs-printState" v-model="form.printState">
               <a-radio value="NO_PRINT" id="transferOutDs-printState1">
                 允许打印
@@ -112,14 +112,16 @@ export default {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
         printState: [{ required: true, message: '请选择备货打印', trigger: 'change' }]
       },
-      detailData: null //  详情数据
+      detailData: null, //  详情数据
+      showPrint: false
     }
   },
   methods: {
     // 初始化
     pageInit (data) {
+      this.showPrint = !data.sendNo
       this.form.sendNo = data.sendNo
-      this.form.printState = data.printState
+      this.form.printState = this.showPrint ? data.printState : undefined
       this.form.receiverSn = data.receiverSn
       this.form.receiverName = data.receiverName
       this.form.explainInfo = data.explainInfo

+ 3 - 4
src/views/allocationManagement/transferOut/printModal.vue

@@ -55,7 +55,7 @@
             打印
           </a-checkbox>
         </a-form-model-item>
-        <a-form-model-item label="发货说明" v-if="nowType=='dbPrint'||showExplainInfo">
+        <a-form-model-item label="发货说明" v-if="nowType=='dbPrint'||nowType=='dbflPrint'">
           <a-checkbox @change="onChangeExplainInfo" :checked="explainInfoFlag" id="allocateBill-print-explainInfo">
             打印
           </a-checkbox>
@@ -207,9 +207,7 @@ export default {
               if (_this.form.orderBy != '-1') {
                 obj.orderBy = _this.form.orderBy
               }
-              if (_this.showExplainInfo) {
-                obj.explainInfoFlag = this.form.explainInfoFlag
-              }
+              obj.explainInfoFlag = this.form.explainInfoFlag
             }
           }
           // 打印
@@ -254,6 +252,7 @@ export default {
         explainInfoFlag: 1 // 发货说明  1打印 0不打印
       }
       this.remarkFlag = true
+      this.explainInfoFlag = true
     }
   },
   watch: {

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -151,7 +151,7 @@
               审核进度
             </a-button>
             <a-button
-              v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEdit')"
+              v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEditFc')"
               size="small"
               type="link"
               class="button-info"
@@ -160,7 +160,7 @@
               再次编辑
             </a-button>
             <a-button
-              v-if="record.status=='AUDIT_PASS'&&$hasPermissions('B_againEdit')"
+              v-if="record.status=='AUDIT_PASS'&&$hasPermissions('B_editFcDetail')"
               size="small"
               type="link"
               class="button-info"