采购相关

src/api/pages/pur/pur-enter.js

@@ -40,6 +40,6 @@ export const routeUrl = {
     //作废
     invalid: {key: 'invalid', method: 'invalid'},
     //编辑
-    edit: {key: 'edit', routeName: 'pur-entry-edit'},
+    edit: {key: 'edit', routeName: 'pur-enter-edit'},
   }
 }

src/components/business/search-cond/index.vue

@@ -191,7 +191,8 @@
                           style="width:100% ;" class="switch-class">
                   <Prepend :label="item.itemName" :required=item.required>
                     <DkSwitch v-model="formData._value[item.valueFormat.code]" :ref="item.valueFormat.code" clearable
-                              :placeholder="vm.$t('inputWords',{'search-name':item.itemName})">
+                              :placeholder="vm.$t('inputWords',{'search-name':item.itemName})"
+                              @on-change="(val) => handleSwitchChange(item.valueFormat.code, val)">
                     </DkSwitch>
                   </Prepend>
                 </FormItem>
@@ -470,6 +471,14 @@ export default {
   },
   methods: {
     /**
+     * @desc   : 执行开关事件
+     * @author : 付斌
+     * @date   : 2023-10-12 15:25
+     */
+    handleSwitchChange(code, e){
+      this.$emit('on-switch-change',{code, e})
+    },
+    /**
      * @desc   : 下拉选择
      * @author : 周兴
      * @date   : 2023/10/12 13:09

src/view/pur/pur-enter/add.vue

@@ -6,7 +6,7 @@
 import CommonForm from "./form";
 
 export default {
-  name: "pur-entry-add",
+  name: "pur-enter-add",
   components: {
     CommonForm
   },

src/view/pur/pur-enter/edit.vue

@@ -6,7 +6,7 @@
 import CommonForm from "./form";
 
 export default {
-  name: "pur-entry-edit",
+  name: "pur-enter-edit",
   components: {
     CommonForm
   },

src/view/pur/pur-enter/form.vue

@@ -71,6 +71,7 @@
         </DkForm>
       </DkPanel>
       <!--商品信息-->
+      {{this.purchaseItemFlag}}
       <DkPanel prop="goodsInformation">
         <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info" slot="content">
           <EditTable slot="left"
@@ -81,7 +82,8 @@
                      :height="400"
                      :freeze="false"
                      :show-footer="true"
-                     :readonly="this.purchaseItemFlag"
+                     :readonly="this.type == this.$config.formMode.edit"
+                     :add-flag="!this.purchaseItemFlag"
                      @changeValue="changeValue"
           ></EditTable>
         </div>
@@ -340,7 +342,7 @@ export default {
       modalTitle: '选择采购订单',//选择成型线弹窗名称
       chooseModal: false,
       purItemId: null,
-      purchaseItemFlag: false,
+      purchaseItemFlag: this.type === this.$config.formMode.add ? false : (this.type === this.$config.formMode.handle ? true:false) ,
       loading: false,
       allCanNoEdit: false, //是否所有的都不允许编辑
       formData: {
@@ -364,7 +366,7 @@ export default {
           field: 'skuCode',
           controlId: 'skuId',
           treeNode: true,
-          type: 'tableSelect',
+          type: self.type === self.$config.formMode.add ? (self.type === self.$config.formMode.handle?'disabled':'tableSelect') : 'disabled',
           fixed: 'left',
           promotionType: true,
           dataType: self.$config.tableSelectType.goodsForPurchase,
@@ -382,7 +384,7 @@ export default {
         {
           field: 'skuName',
           controlId: 'skuId',
-          type: 'tableSelect',
+          type: self.type === self.$config.formMode.add ? (self.type === self.$config.formMode.handle?'disabled':'tableSelect') : 'disabled',
           fixed: 'left',
           promotionType: true,
           dataType: self.$config.tableSelectType.goodsForPurchase,

src/view/pur/pur-return/index.vue

@@ -21,7 +21,8 @@
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
       <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :setFlag="false"
-                  :search-content="searchContent"></SearchCond>
+                  :search-content="searchContent"
+                  @on-switch-change="changeShowCancel"></SearchCond>
     </div>
 
     <!--  表格部分  -->
@@ -55,6 +56,8 @@
           <DkTableColumn field="contactPhone"></DkTableColumn>
           <!--送货日期-->
           <DkTableColumn field="deliveryDate" data-type="date"/>
+           <!--退货状态-->
+          <DkTableColumn field="returnStatus"></DkTableColumn>
           <!--出库状态-->
           <DkTableColumn field="outStatusName" :color-cards="['出库中','已出库']"></DkTableColumn>
           <!-- 出库中数量-->
@@ -94,6 +97,8 @@
           <DkTableColumn field="contactPhone"></DkTableColumn>
           <!--送货日期-->
           <DkTableColumn field="deliveryDate" data-type="date"/>
+          <!--退货状态-->
+          <DkTableColumn field="returnStatus"></DkTableColumn>
           <!--出库状态-->
           <DkTableColumn field="outStatusName" :color-cards="['出库中','已出库']"></DkTableColumn>
           <!--已出库数量-->
@@ -202,6 +207,8 @@ export default {
   data() {
     let self = this
     return {
+      //显示冲正
+      isShowCancel:false,
       standardGoodsFlag: true,
       reviewResumeFlag: false,
       tableModel: 'waitOut',
@@ -269,7 +276,7 @@ export default {
         {
           itemCode: '查看冲正单据',
           itemName: '查看冲正单据',
-          valueFormat: {code: 'showItem', default: false},
+          valueFormat: {code: 'showCancel', default: false},
           valueKind: 'SWITCH'
         },
       ],
@@ -310,6 +317,20 @@ export default {
     },
 
     /**
+    * @desc   : 查冲正单据
+    * @author : 常皓宁
+    * @date   : 2024/3/23 15:10
+    */
+    changeShowCancel({code, e}) {
+      console.log('asas',code, e)
+      if ('showCancel' === code) {
+        this.isShowCancel = e;
+        // 查询数据
+        this.getData();
+      }
+    },
+
+    /**
     * @desc   : 作废
     * @author : 常皓宁
     * @date   : 2024/3/21 12:59
@@ -352,6 +373,12 @@ export default {
       params.pageSize = this.pageInfo.pageSize
       params.flgValid = true
       params.returnType = '退货类型-采退退货'
+      if (this.isShowCancel) {
+        params.isShowCancel = 1
+      } else {
+        params.isShowCancel = null
+
+      }
       if (this.$store.state.user.cpId) {
         params.cpId = this.$store.state.user.cpId  //所属公司
       }