Переглянути джерело

Merge branch 'develop_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fencang

lilei 2 роки тому
батько
коміт
622fde41d1

+ 3 - 4
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -28,12 +28,11 @@
               </span>
               <span v-else>--</span>
             </a-descriptions-item>
-            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="授权类型">{{ form&&form.menuMouldVal ? form.menuMouldVal : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="授权类型">{{ form&&form.menuMouldIdDictValue ? form.menuMouldIdDictValue : '--' }}</a-descriptions-item>
             <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="财务编码">{{ form&&form.kdMidCustomerFnumber ? form.kdMidCustomerFnumber : '--' }}</a-descriptions-item>
-            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="默认仓库">{{ form&&form.warehouseName ? form.warehouseName : '--' }}</a-descriptions-item>
-            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="授权类型">{{ form&&form.menuMouldVal ? form.menuMouldVal : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="默认仓库">{{ form&&form.defaultWarehouseName ? form.defaultWarehouseName : '--' }}</a-descriptions-item>
             <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="财务编码">{{ form&&form.kdMidCustomerFnumber ? form.kdMidCustomerFnumber : '--' }}</a-descriptions-item>
-            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="默认仓库">{{ form&&form.warehouseName ? form.warehouseName : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="默认仓库">{{ form&&form.defaultWarehouseName ? form.defaultWarehouseName : '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
         <a-card title="公司信息" size="small" style="margin-bottom: 15px;">