Browse Source

bug 修复

lilei 4 năm trước cách đây
mục cha
commit
ba54a5e935
1 tập tin đã thay đổi với 28 bổ sung26 xóa
  1. 28 26
      src/views/purchasingManagement/purchaseOrder/list.vue

+ 28 - 26
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -34,30 +34,28 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="purchaseOrderList-billStatus"
-                  code="PURCHASE_BILL_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="财务状态">
-                <v-select
-                  v-model="queryParam.financialStatus"
-                  ref="financialStatus"
-                  id="purchaseOrderList-financialStatus"
-                  code="FINANCIAL_PAY_STATUS"
-                  placeholder="请选择财务状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :md="6" :sm="24" v-show="advanced">
+            <a-form-item label="业务状态">
+              <v-select
+                v-model="queryParam.billStatus"
+                ref="billStatus"
+                id="purchaseOrderList-billStatus"
+                code="PURCHASE_BILL_STATUS"
+                placeholder="请选择业务状态"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="advanced">
+            <a-form-item label="财务状态">
+              <v-select
+                v-model="queryParam.financialStatus"
+                ref="financialStatus"
+                id="purchaseOrderList-financialStatus"
+                code="FINANCIAL_PAY_STATUS"
+                placeholder="请选择财务状态"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseOrderList-refresh">查询</a-button>
@@ -95,7 +93,11 @@
       </template>
       <!-- 财务状态 -->
       <template slot="financialStatus" slot-scope="text, record">
-        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.financialStatusDictValue" />
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="$refs.financialStatus.getNameByCode(text)" />
+      </template>
+      <!-- 业务状态 -->
+      <template slot="billStatus" slot-scope="text, record">
+        {{ $refs.billStatus.getNameByCode(text) }}
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -175,7 +177,7 @@ export default {
         { title: '产品款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购金额(¥)', dataIndex: 'totalAmount', width: 115, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
+        { title: '业务状态', dataIndex: 'billStatus', scopedSlots: { customRender: 'billStatus' }, width: 110, align: 'center' },
         { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],