浏览代码

Merge branch 'develop_yh12' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh12

lilei 2 年之前
父节点
当前提交
551d464864

+ 3 - 1
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -120,6 +120,7 @@ export default {
           const form = JSON.parse(JSON.stringify(_this.form))
           form.attachmentList = _this.attachList
           _this.spinning = true
+          debugger
           sparePartsReturnSave(form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
@@ -146,7 +147,8 @@ export default {
           const obj = {
             supplierSn: resultObj.supplierSn,
             returnReason: resultObj.returnReason, // 退货原因
-            explainInfo: resultObj.explainInfo // 补充说明
+            explainInfo: resultObj.explainInfo, // 补充说明
+            sparePartsReturnSn: this.itemSn
           }
           this.$nextTick(() => {
             this.$refs.attachList.setFileList(this.attachList)

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -18,7 +18,7 @@
         <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.returnReason || '--' }}</a-descriptions-item>
         <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="附件" :span="3">
-          <span v-if="detailsData&&detailsData.attachmentList">
+          <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">
             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailsData.attachmentList" :key="item.id">
               {{ item.fileName }}
             </a>

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -54,6 +54,7 @@
                   @click="handleExport"
                   :disabled="disabled"
                   :loading="exportLoading"
+                  v-if="$hasPermissions('B_purchaseReturnExport')"
                 >导出明细</a-button>
               </span>
             </a-col>
@@ -61,7 +62,6 @@
         </a-form>
       </div>
       <!-- 操作按钮 -->
-      <!-- v-if="$hasPermissions('B_sparePartsExport')" -->
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
         <!-- <a-button
@@ -181,7 +181,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: '15%', align: 'center' },
         { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货原因', dataIndex: 'explainInfo', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货原因', dataIndex: 'returnReasonDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货金额', dataIndex: 'totalCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toFixedDecimal(text, 2) : '--') } },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },

+ 0 - 1
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -289,7 +289,6 @@ export default {
       this.productForm.productName = ''
       this.productForm.productCode = ''
       this.$refs.table.refresh(!!flag)
-      this.$refs.partQuery.resetSearchForm()
     },
     // 已选产品  blur
     onCellBlur (val, record) {

+ 2 - 1
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -110,7 +110,8 @@ export default {
         beginDate: '',
         endDate: '',
         sparePartsNo: '',
-        isZero: 0
+        isZero: 0,
+        createDate: '2023-01-01 00:00:00'
       },
       warehousingDate: [], // 入库时间
       disabled: false, //  查询、重置按钮是否可操作