Browse Source

bug 修复

lilei 4 years ago
parent
commit
3dc227c57b

+ 5 - 5
src/views/financialManagement/warehousingAudit/list.vue

@@ -27,13 +27,13 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="财务审核状态">
+              <a-form-item label="入库审核状态">
                 <v-select
                   v-model="queryParam.auditState"
                   ref="auditState"
                   id="warehousingAuditList-auditState"
                   code="RECEIVING_BILL_STATUS"
-                  placeholder="请选择财务审核状态"
+                  placeholder="请选择入库审核状态"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
@@ -123,9 +123,9 @@ export default {
         { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库总成本', dataIndex: 'totalPutAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'stockPutTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '签收入库时间', dataIndex: 'stockPutTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 27 - 9
src/views/salesManagement/salesQuery/list.vue

@@ -128,33 +128,51 @@
           class="button-warning"
           v-if="record.billStatus == 'WAIT_AUDIT'"
           @click="handleEexamine(record)"
-          id="salesManagementList-eexamine-btn">审核</a-button>
+        >审核</a-button>
         <a-button
           size="small"
           type="link"
           v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE'"
           class="button-primary"
           @click="handleSend(record)"
-          id="salesManagementList-send-btn">出库</a-button>
+        >出库</a-button>
         <a-button
           size="small"
           type="link"
           class="button-info"
-          v-if="record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_WAREHOUSE'"
+          v-if="record.salesBillSource == 'SALES' && record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_WAREHOUSE'"
           @click="handleEdit(record)"
-          id="salesManagementList-edit-btn">
-          {{ record.salesBillSource == 'PURCHASE'?'改单':'编辑' }}
+        >
+          编辑
         </a-button>
         <a-button
           size="small"
           type="link"
           class="button-error"
-          v-if="record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'"
+          v-if="record.salesBillSource == 'SALES' && record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'"
           @click="handleDel(record)"
-          id="salesManagementList-del-btn">
-          {{ record.salesBillSource == 'PURCHASE'?'取消':'删除' }}
+        >
+          删除
         </a-button>
-        <span v-if="record.billStatus == 'FINISH'">--</span>
+        <a-button
+          size="small"
+          type="link"
+          class="button-info"
+          v-if="record.salesBillSource == 'PURCHASE' && record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_WAREHOUSE'&& record.billStatus != 'AUDIT_REJECT'"
+          @click="handleEdit(record)"
+        >
+          改单
+        </a-button>
+        <a-button
+          size="small"
+          type="link"
+          class="button-error"
+          v-if="record.salesBillSource == 'PURCHASE' && record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'&& record.billStatus != 'AUDIT_REJECT'"
+          @click="handleDel(record)"
+        >
+          取消
+        </a-button>
+        <span v-if="record.billStatus == 'FINISH'||(record.salesBillSource == 'PURCHASE'&&record.billStatus == 'AUDIT_REJECT')">--</span>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->