瀏覽代碼

采购退货申请单新增产品类型

chenrui 4 月之前
父節點
當前提交
534f7829ad

+ 1 - 1
public/version.json

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

+ 1 - 1
src/config/router.config.js

@@ -1155,7 +1155,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:sn',
+                path: 'edit/:sn/:val',
                 name: 'purchaseReturnApplyFormEdit',
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturnApplyForm/edit.vue'),
                 meta: {

+ 1 - 0
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -288,6 +288,7 @@ export default {
         this.disabled = true
         this.queryParam.sysFlag = '1' // 剪冠产品
         this.queryParam.onlineFalg = this.goodFlag == 'GOOD_PRODUCT_RETURN' ? 1 : undefined // 上线标志,根据 良品or坏品
+        this.queryParam.returnProductType = this.$route.params.val
         return queryDealerScopeProductPage(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize

+ 30 - 4
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -56,6 +56,17 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品类别">
+                  <v-select
+                    v-model="queryParam.returnProductType"
+                    ref="returnProductType"
+                    id="purchaseReturnList-returnProductType"
+                    code="RETURN_PRODUCT_TYPE"
+                    placeholder="请选择产品类别"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseReturnList-refresh">查询</a-button>
@@ -157,6 +168,18 @@
             placeholder="请选择退货类别"
             allowClear></v-select>
         </div>
+        <div style="display:flex;align-items: center;padding-top: 20px;">
+          <span style="color:red;">*</span>
+          <span>产品类别:</span>
+          <v-select
+            id="purchaseReturnList-goodFlag-btn"
+            style="width:250px;"
+            showType="radio"
+            v-model="returnProductType"
+            code="RETURN_PRODUCT_TYPE"
+            placeholder="请选择产品类别"
+            allowClear></v-select>
+        </div>
       </div>
     </common-modal>
   </a-card>
@@ -193,9 +216,11 @@ export default {
         billSource: undefined, // 单据来源
         goodFlag: undefined, // 退货类别
         beginAuditDate: '', // 审核开始时间
-        endAuditDate: '' // 审核结束时间
+        endAuditDate: '', // 审核结束时间
+        returnProductType: undefined// 产品类别
       },
       goodFlag: 'DEFECTIVE_PRODUCT_RETURN', // 退货类别默认值
+      returnProductType: undefined, // 产品类别
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0, // 表格高度
       // 加载数据方法 必须为 Promise 对象
@@ -228,6 +253,7 @@ export default {
         { title: '采购退货申请单号', scopedSlots: { customRender: 'purchaseReturnApplyNo' }, width: '14%', align: 'center' },
         { title: '供应商', dataIndex: 'returnTargetName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品类别', dataIndex: 'returnProductTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总公司实收数量', dataIndex: 'totalReceiveQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -300,7 +326,7 @@ export default {
     handleEdit (row) {
       const _this = this
       if (row) { //  编辑
-        _this.$router.push({ name: 'purchaseReturnApplyFormEdit', params: { sn: row.purchaseReturnApplySn } })
+        _this.$router.push({ name: 'purchaseReturnApplyFormEdit', params: { sn: row.purchaseReturnApplySn, val: row.returnProductType } })
       } else { //  新增
         _this.openTipsModal = true
       }
@@ -315,7 +341,7 @@ export default {
       const _this = this
       if (_this.goodFlag) {
         _this.spinning = true
-        purchaseReturnSave({ goodFlag: _this.goodFlag }).then(res => {
+        purchaseReturnSave({ goodFlag: _this.goodFlag, returnProductType: _this.returnProductType }).then(res => {
           if (res.status == 200) {
             const data = res.data
             _this.spinning = false
@@ -323,7 +349,7 @@ export default {
             // 重置查询条件
             _this.resetData()
             // 进入编辑页面
-            _this.$router.push({ name: 'purchaseReturnApplyFormEdit', params: { sn: data.purchaseReturnApplySn } })
+            _this.$router.push({ name: 'purchaseReturnApplyFormEdit', params: { sn: data.purchaseReturnApplySn, val: data.returnProductType } })
           } else {
             _this.spinning = false
           }