Selaa lähdekoodia

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

lilei 4 kuukautta sitten
vanhempi
commit
fb6c2d403c

+ 1 - 1
public/version.json

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

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

@@ -214,7 +214,7 @@
             type="link"
             :id="'salesManagementList-edit-'+record.salesBillNo"
             class="button-primary"
-            v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus != 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')"
+            v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -219,7 +219,7 @@
               type="link"
               :id="'salesManagementList-edit-'+record.salesBillNo"
               class="button-primary"
-              v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus != 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')"
+              v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' ||record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')||(record.sourceType == 'XPRH_PURCHASE'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
               @click="handleEdit(record)"
             >
               编辑