浏览代码

修改bug

chenrui 11 月之前
父节点
当前提交
eac1f03aed

+ 29 - 28
src/store/modules/app.js

@@ -36,7 +36,7 @@ const app = {
     employeeList: [], // 申请人列表
     defectiveReturnReason: [], // 不良品申请退货列表
     goodReturnReason: [], // 良品申请退货列表
-    bookReason:[], // 收款事由
+    bookReason: [], // 收款事由
     tempBillOfData: null, // 临时存储收货单数据
     authMenusList: [], // 权限菜单数据
     priceAuthOptions: [], // 价格权限选项
@@ -48,11 +48,11 @@ const app = {
     warehouseAuthList: null, // 有权限的仓库列表
     warehouseAllList: null, // 无权限所有仓库列表
     defWarehouse: null, // 默认仓库
-    isWarehouse: false,// 仓库管理权限
-    isShowCustomerSearch:false ,//客服查询权限
+    isWarehouse: false, // 仓库管理权限
+    isShowCustomerSearch: false, // 客服查询权限
     interFaceList: [
       // 销售单,下推
-     {
+      {
         a: 'sales/findBySn',
         b: [
           'sales/submit',
@@ -78,7 +78,7 @@ const app = {
           'sales/detail/pushOfBatch',
           'dispatch/detail/deleteBatch',
           'dispatch/detail/updateQty'
-          ],
+        ],
         timeStr: ''
       },
       // 销售退货
@@ -109,7 +109,7 @@ const app = {
           'salesReturn/detail/insertByReceive',
           'salesReturn/detail/insertByCustomerService',
           'salesReturn/detail/updateAllReason'
-          ],
+        ],
         timeStr: ''
       },
       // 散件入库
@@ -119,8 +119,9 @@ const app = {
           'spareParts/saveDetail',
           'spareParts/deleteDetail',
           'spareParts/detail/parseProducts',
-          'spareParts/detail/batchInsert'
-          ],
+          'spareParts/detail/batchInsert',
+          'spareParts/queryBySn'
+        ],
         timeStr: ''
       },
       // 采购退货
@@ -131,7 +132,7 @@ const app = {
           'sparePartsReturn/detail/delete',
           'sparePartsReturn/detail/save',
           'sparePartsReturn/detail/saveBatch'
-          ],
+        ],
         timeStr: ''
       },
       // 采购入库
@@ -143,11 +144,11 @@ const app = {
           'purchase/detail/batchInsert',
           'purchase/setSupplierInfo',
           'purchase/submit'
-          ],
+        ],
         timeStr: ''
       },
       // 调拨
-     {
+      {
         a: 'allocateBill/findBySn',
         b: [
           'allocateBill/submit',
@@ -159,10 +160,10 @@ const app = {
           'allocateBill/detail/parseProducts',
           'allocateBill/detail/batchInsert',
           ''
-          ],
+        ],
         timeStr: ''
       },
-      //调拨退货
+      // 调拨退货
       {
         a: 'allocateReturn/queryBySn',
         b: [
@@ -173,7 +174,7 @@ const app = {
           'allocReturnDetail/insert',
           'allocReturnDetail/insertBatch',
           'allocReturnDetail/update'
-          ],
+        ],
         timeStr: ''
       },
       // 发货单
@@ -183,7 +184,7 @@ const app = {
           'sendBill/update',
           'sendBill/updateIssueRemark',
           'sendBill/updateTransportInfo'
-          ],
+        ],
         timeStr: ''
       },
       // 提货单
@@ -254,7 +255,7 @@ const app = {
     SET_employeeList: (state, val) => {
       state.employeeList = val
     },
-    SET_returnReason:(state, obj) => {
+    SET_returnReason: (state, obj) => {
       state[obj.key] = obj.val
     },
     SET_showPdfPrint: (state, val) => {
@@ -316,18 +317,18 @@ const app = {
         }
       })
     },
-    getLookUpDataByCode({ commit }, params) {
-        getLookUpData({
-          pageNo: 1,
-          pageSize: 1000,
-          lookupCode: params.code,
-          isEnable: params.isEnable
-        }).then(res => {
-          if (res.status == 200) {
-            commit('SET_returnReason', {key: params.key, val: res.data.list})
-          }
-        })
-    },
+    getLookUpDataByCode ({ commit }, params) {
+      getLookUpData({
+        pageNo: 1,
+        pageSize: 1000,
+        lookupCode: params.code,
+        isEnable: params.isEnable
+      }).then(res => {
+        if (res.status == 200) {
+          commit('SET_returnReason', { key: params.key, val: res.data.list })
+        }
+      })
+    }
   }
 }
 

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -147,8 +147,8 @@ export default {
               // 小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
               data.list[i].subtotal = getOperationalPrecision(data.list[i].productCost || 0, data.list[i].productQty)
             }
-            this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.$route.params.sn }))
             this.getBasicInfoData()
+            this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.$route.params.sn }))
           }
           return data
         })

+ 4 - 4
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -73,7 +73,7 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="handleSearch" :disabled="disabled" id="purchaseReceiptList-refresh">查询</a-button>
                 <a-button style="margin-left: 10px" @click="resetSearchForm()" :disabled="disabled" id="purchaseReceiptList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <a @click="advanced=!advanced" style="margin-left: 8px" id="purchaseReceiptList-advanced">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
@@ -99,7 +99,7 @@
           ref="table"
           :style="{ height: tableHeight+70+'px' }"
           size="small"
-          :rowKey="(record) => record.sparePartsReturnNo"
+          :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
           :pageSize="30"
@@ -108,7 +108,7 @@
           bordered>
           <!-- 采购退货单号 -->
           <template slot="purchaseReceiptNo" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_purchaseReceiptDetail')" id="purchaseReceiptList-detail-btn" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
+            <span v-if="$hasPermissions('B_purchaseReceiptDetail')" :id="'purchaseReceiptList-detail-btn'+record.id" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
             <span v-else>{{ record.sparePartsNo }}</span>
           </template>
           <!-- 操作 -->
@@ -121,7 +121,7 @@
               class="button-warning"
               @click="handleCheck(record)"
               v-if="$hasPermissions('B_purchaseReceiptAudit') && record.state ==='WAIT_AUDIT'&&(!record.thirdpartyBizState)"
-              id="purchaseReceiptList-examine-btn">审核</a-button>
+              :id="'purchaseReceiptList-examine-btn'+record.id">审核</a-button>
             <a-button
               size="small"
               type="link"