Browse Source

bug修复

chenrui 4 years ago
parent
commit
b07ddf0f4a

+ 1 - 0
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -601,6 +601,7 @@ export default {
       this.disabled = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      params.enabledFlag = 1
       dealerProductList(params).then(res => {
         if (res.status == 200) {
           const data = res.data

+ 5 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -66,18 +66,19 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
-          v-if="record.state != 'WAIT_AUDIT'"
+          v-if="record.state == 'WAIT'"
           @click="handleEdit(record)"
           id="purchaseReturnList-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
-          v-if="record.state != 'WAIT_AUDIT'"
+          v-if="record.state == 'WAIT'"
           @click="handleDel(record)"
           id="purchaseReturnList-del-btn">删除</a-button>
+        <span v-if="record.state != 'WAIT'">--</span>
       </template>
     </s-table>
   </a-card>

+ 3 - 3
src/views/salesManagement/outboundOrder/list.vue

@@ -82,7 +82,7 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
-      :scroll="{ x: 1700 }"
+      :scroll="{ x: 1710 }"
       bordered> -->
     <s-table
       class="sTable"
@@ -91,7 +91,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1700, y: tableHeight }"
+      :scroll="{ x: 1720, y: tableHeight }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -136,7 +136,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },