浏览代码

修改bug

chenrui 7 月之前
父节点
当前提交
742bfb3945

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -200,12 +200,12 @@ export default {
         { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单据号', dataIndex: 'bizNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', scopedSlots: { customRender: 'newUnitName' }, width: '9%', align: 'center', ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouseName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
         // { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -106,7 +106,7 @@
               type="link"
               class="button-error"
               :id="'purchaseReturnList-del-'+record.id"
-              v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyDel')"
+              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'CANCEL')&&$hasPermissions('B_purchaseReturnApplyDel')"
               @click="handleDel(record)"
             >删除</a-button>
             <a-button