chenrui 2 anni fa
parent
commit
3ab35f1973

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

@@ -5,41 +5,41 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="入库单号">
+                <a-input id="bulkWarehousingOrderList-sparePartsNo" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="供应商名称">
                 <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入供应商名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核状态">
+              <a-form-item label="退货原因">
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
                   id="bulkWarehousingOrderList-state"
                   code="SPARE_PARTS_STATE"
-                  placeholder="请选择审核状态"
+                  placeholder="请选择退货原因"
                   allowClear
                 ></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="入库单号">
-                <a-input id="bulkWarehousingOrderList-sparePartsNo" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="退货原因">
+              <a-form-item label="审核状态">
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
                   id="bulkWarehousingOrderList-state"
                   code="SPARE_PARTS_STATE"
-                  placeholder="请选择退货原因"
+                  placeholder="请选择审核状态"
                   allowClear
                 ></v-select>
               </a-form-item>
@@ -159,7 +159,7 @@ import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { sparePartsList, sparePartsDelete, sparePartsAudit, sparePartsDetailExport } from '@/api/spareParts'
 export default {
-  name: 'BulkWarehousingOrderList',
+  name: 'PurchaseReturnList',
   mixins: [commonMixin],
   components: { STable, VSelect, reportModal, detailModal, addModal, chooseDepartUserModal, rangeDate },
   data () {
@@ -215,7 +215,7 @@ export default {
 	      { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '15%', align: 'center' },
 	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '15%', align: 'center' },
 	      { title: '供应商名称', dataIndex: 'supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
-	      { title: '退原因', dataIndex: 'remark', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+	      { title: '退原因', dataIndex: 'remark', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'productTotalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      { title: '退货金额', dataIndex: 'productTotalCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      { title: '审核时间', dataIndex: 'sparePartsTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -256,7 +256,7 @@ export default {
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/purchasingManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsSn}` })
+      this.$router.push({ path: `/purchasingManagement/purchaseReturn/purchaseReturnDeatil`})
     },
     //  详情
     handleDetail (row) {

+ 15 - 8
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -10,6 +10,9 @@
       <a-card size="small" :bordered="false" class="outboundOrderDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
+            <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase" >
+              <a-icon type="edit" /> 编辑基础信息
+            </div>
             <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
               <a-descriptions-item label="采购退货单号">CT20221229000001</a-descriptions-item>
               <a-descriptions-item label="入库单号">SJ221222000001</a-descriptions-item>
@@ -58,11 +61,6 @@
               </a-row>
             </a-form>
           </div>
-          <div>
-            <span style="margin-right: 10px;" v-if="selNums">已选{{ selNums }}项</span>
-            <a-button type="default" class="button-info" @click="openPlSetReason">批量设置退货原因</a-button>
-            <a-button type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-          </div>
         </div>
         <!-- 已选配件列表 -->
         <s-table
@@ -128,6 +126,8 @@
         </div>
       </div>
     </commonModal>
+    <!-- 编辑基础信息弹窗 -->
+    <add-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </div>
 </template>
 
@@ -137,6 +137,7 @@ import { STable, VSelect } from '@/components'
 import { printFun, exportExcel } from '@/libs/JGPrint.js'
 // import ImportGuideModal from './importGuideModal.vue'
 import queryPart from './queryPart.vue'
+import addModal from './addModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import EditableCell from '@/views/common/editInput.js'
 // import chooseDepartUserModal from './chooseDepartUserModal.vue'
@@ -165,7 +166,8 @@ export default {
     EditableCell,
     returnReason,
     commonModal,
-    queryPart
+    queryPart,
+    addModal
   },
   data () {
     return {
@@ -212,7 +214,8 @@ export default {
       total: 0,
       rowSelectionInfo: null,
       plReturnReason: '',
-      showPlModal: false
+      showPlModal: false,
+      openModal: false
     }
   },
   watch: {
@@ -245,9 +248,13 @@ export default {
     }
   },
   methods: {
+    // 编辑基础信息
+    handleEditBase () {
+      this.openModal = true
+    },
     //  返回
     handleBack () {
-      this.$router.push({ name: 'salesReturnList', query: { closeLastOldTab: true } })
+      this.$router.push({ path: `/purchasingManagement/purchaseReturn/list`, query: { closeLastOldTab: true } })
     },
     // 表格选中项
     rowSelectionFun (obj) {