chenrui 2 лет назад
Родитель
Сommit
5149360a99

+ 9 - 1
src/api/salesReturn.js

@@ -262,4 +262,12 @@ export const salesReturnDetailImportError = (params) => {
     method: 'post',
     responseType: 'blob'
   })
-}
+}
+// 获取审批人员默认值
+export const queryLastFinishDingUser = (params) => {
+  return axios({
+    url: '/salesReturn/queryLastFinishDingUser',
+    data: params,
+    method: 'post'
+  })
+}

+ 0 - 1
src/views/productManagement/productInfo/offlineImportModal.vue

@@ -164,7 +164,6 @@ export default {
           if (res.data.rightList && res.data.rightList.length > 0) {
             res.data.rightList.map((item, index) => {
               item.no = index + 1
-              item.commonSn = ''
               _this.$nextTick(() => {
                 const val = 'productCodeList' + item.no
                 _this.$refs[val].setData({ key: item.commonCode })

+ 28 - 0
src/views/salesReturnManagement/salesReturn/chooseDepartUserModal.vue

@@ -82,6 +82,7 @@ import { VSelect, Upload } from '@/components'
 import dingDepartUser from '@/views/common/dingDepartUser.js'
 import employee from '@/views/expenseManagement/expenseReimbursement/employee.js'
 import { sign } from 'core-js/fn/number'
+import { queryLastFinishDingUser } from '@/api/salesReturn'
 export default {
   name: 'ChooseDepartUserModal',
   components: { dingDepartUser, employee, VSelect, Upload },
@@ -89,6 +90,10 @@ export default {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    showDefUser: { // 是否显示默认值
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -204,6 +209,27 @@ export default {
     },
     cancel () {
       this.isShow = false
+    },
+    pageInit () {
+      // 获取审批人员默认值
+      if (this.showDefUser) {
+        queryLastFinishDingUser({}).then(res => {
+          if (res.status == 200) {
+            if (res.data.approversTaskList) {
+              const newApprovers = res.data.approversTaskList.map(item => {
+                return { label: item.userName, value: item.userId || item.userid }
+              })
+              this.form.approvers = this.getTreeVal(newApprovers)
+            }
+            if (res.data.ccTaskList) {
+              const newCcTaskList = res.data.ccTaskList.map(item => {
+                return { label: item.userName, value: item.userId || item.userid }
+              })
+              this.form.ccList = this.getTreeVal(newCcTaskList)
+            }
+          }
+        })
+      }
     }
   },
   watch: {
@@ -216,6 +242,8 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.resetForm()
+      } else {
+        this.pageInit()
       }
     }
   }

+ 12 - 12
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -8,14 +8,14 @@
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 15px;color: #666;" v-if="ordeDetail">
             退货仓库:<warehouse
-               style="width:200px;"
-               :allowClear="false"
-               disabled
-                v-model="ordeDetail.warehouseSn"
-                @change="updateWarehouse"
-                id="basicInfo-warehouseSn"
-                placeholder="请选择退货仓库"
-              />
+              style="width:200px;"
+              :allowClear="false"
+              disabled
+              v-model="ordeDetail.warehouseSn"
+              @change="updateWarehouse"
+              id="basicInfo-warehouseSn"
+              placeholder="请选择退货仓库"
+            />
           </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -141,7 +141,7 @@
         id="salesReturn-handleSubmit">提交</a-button>
     </div>
     <!-- 选择审核人员 -->
-    <chooseDepartUserModal ref="chooseDepart" :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
+    <chooseDepartUserModal ref="chooseDepart" :showDefUser="true" :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesReturnBillSn: $route.params.sn}" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 批量设置退货原因 -->
@@ -309,10 +309,10 @@ export default {
       }
     },
     // 修改仓库
-    updateWarehouse(warehouseSn){
+    updateWarehouse (warehouseSn) {
       const _this = this
       _this.spinning = true
-      const params = {id:this.ordeDetail.id,warehouseSn: warehouseSn}
+      const params = { id: this.ordeDetail.id, warehouseSn: warehouseSn }
       salesReturnModify(params).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
@@ -379,7 +379,7 @@ export default {
     getOrderDetail (flag) {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        if(!flag){
+        if (!flag) {
           this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseSn)
         }
       })