Ver Fonte

bug 修复

lilei há 2 anos atrás
pai
commit
42a4b136ee

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1660816981394
+  "version": 1661314687495
 }

+ 15 - 3
src/components/index.less

@@ -394,9 +394,21 @@
       color: #d62a00;
     }
   }
-  td > div:empty{
-    &::after{
-      content:'--'
+  .ant-table-row{
+    td{
+      > div:empty::after{
+        content: '--';
+      }
+    }
+  }
+  .ant-table-small > .ant-table-content .ant-table-body,.ant-table-fixed-right{
+    margin: 0;
+    tr:hover{
+      td{
+        > div:empty::after{
+          content: '--';
+        }
+      }
     }
   }
 }

+ 2 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -34,7 +34,7 @@
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
-                申请退货数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong>;
+                申请退货数量:<strong>{{ (basicInfoData&&(basicInfoData.totalInitialQty || basicInfoData.totalInitialQty==0)) ? basicInfoData.totalInitialQty : '--' }}</strong>;
                 总公司实收数量:<strong>{{ (basicInfoData&&(basicInfoData.totalReceiveQty || basicInfoData.totalReceiveQty==0)) ? basicInfoData.totalReceiveQty : '--' }}</strong>;
                 坏件数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty==0)) ? basicInfoData.totalBadQty : '--' }}</strong>;
                 良品数量:<strong>{{ (basicInfoData&&(basicInfoData.totalGoodQty || basicInfoData.totalGoodQty==0)) ? basicInfoData.totalGoodQty : '--' }}</strong>;
@@ -110,7 +110,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请退货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '申请退货数量', dataIndex: 'initQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总公司实收数量', dataIndex: 'receiveQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'goodQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 7 - 7
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -109,7 +109,7 @@
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
-                申请退货数量:<strong>{{ (detailData&&(detailData.totalQty || detailData.totalQty==0)) ? detailData.totalQty : '--' }}</strong> ;
+                申请退货数量:<strong>{{ (detailData&&(detailData.totalInitialQty || detailData.totalInitialQty==0)) ? detailData.totalInitialQty : '--' }}</strong> ;
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -170,7 +170,7 @@
                 <a-input-number
                   size="small"
                   id="purchaseReturnEdit-qty"
-                  v-model="record.qty"
+                  v-model="record.initQty"
                   :precision="0"
                   :min="1"
                   placeholder="请输入"
@@ -286,7 +286,7 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
-            data.list[i].qtyBackups = data.list[i].qty
+            data.list[i].qtyBackups = data.list[i].initQty
             data.list[i].returnReasonBackups = data.list[i].returnReason
           }
           this.dataSource = data.list
@@ -384,7 +384,7 @@ export default {
       }
       const params = {
         purchaseReturnApplySn: this.$route.params.sn,
-        qty: row.returnQty, //  退货数量
+        initQty: row.returnQty, //  退货数量
         productSn: row.productSn,
         returnReason: row.returnReason
       }
@@ -475,17 +475,17 @@ export default {
       if (val != record.qtyBackups) {
         this.spinning = true
         purchaseReturnModifyQty({
-          qty: record.qty,
+          initQty: record.initQty,
           purchaseReturnApplyDetailSn: record.purchaseReturnApplyDetailSn,
           purchaseReturnApplySn: this.$route.params.sn
         }).then(res => {
           if (res.status == 200) {
             this.$message.success(res.message)
             this.$refs.chooseTable.refresh()
-            record.qtyBackups = record.qty
+            record.qtyBackups = record.initQty
             this.getDetail()
           } else {
-            record.qty = record.qtyBackups
+            record.initQty = record.qtyBackups
           }
           this.spinning = false
         })

+ 31 - 29
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -107,35 +107,37 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-primary"
-            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturn_outSnycEdit')"
-            @click="handleEdit(record,1)"
-            id="purchaseReturnList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_purchaseReturn_outSnycAudit')"
-            @click="handleAudit(record)"
-            class="button-primary"
-            id="bulkReturnGoodsList-audit-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_purchaseReturn_outSnycOut')"
-            @click="handleWarehouse(record)"
-            class="button-primary"
-            id="bulkReturnGoodsList-out-btn">出库</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturn_outSnycDel')"
-            @click="handleDel(record)"
-            id="purchaseReturnList-del-btn">删除</a-button>
-          <span v-if="record.state == 'FINISH'||!($hasPermissions('B_purchaseReturn_outSnycEdit') || $hasPermissions('B_purchaseReturn_outSnycDel')||$hasPermissions('B_purchaseReturn_outSnycOut')||$hasPermissions('B_purchaseReturn_outSnycAudit'))">--</span>
+          <div v-if="record.synchronizationType == '0'">
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturn_outSnycEdit')"
+              @click="handleEdit(record,1)"
+              id="purchaseReturnList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_purchaseReturn_outSnycAudit')"
+              @click="handleAudit(record)"
+              class="button-primary"
+              id="bulkReturnGoodsList-audit-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_purchaseReturn_outSnycOut')"
+              @click="handleWarehouse(record)"
+              class="button-primary"
+              id="bulkReturnGoodsList-out-btn">出库</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturn_outSnycDel')"
+              @click="handleDel(record)"
+              id="purchaseReturnList-del-btn">删除</a-button>
+          </div>
+          <div v-else></div>
         </template>
       </s-table>
     </a-spin>