bug修复

src/views/admin/wmdaagent/components/AEform.vue

@@ -68,36 +68,36 @@
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="营业执照" prop="yyzz">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'yyzz')" :info="form.yyzz" key="yyzz" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'yyzz')" :info="form.yyzz" key="yyzz" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="社保缴纳证明" prop="sbjnzm">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'sbjnzm')" :info="form.sbjnzm" key="sbjnzm" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'sbjnzm')" :info="form.sbjnzm" key="sbjnzm" />
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="身份证照片（人像面）" prop="frsfzzmZm">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'frsfzzmZm')" :info="form.frsfzzmZm" key="frsfzzmZm" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'frsfzzmZm')" :info="form.frsfzzmZm" key="frsfzzmZm" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="身份证照片（国徽面）" prop="frsfzzmBm">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'frsfzzmBm')" :info="form.frsfzzmBm" key="frsfzzmBm" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'frsfzzmBm')" :info="form.frsfzzmBm" key="frsfzzmBm" />
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="法人手持身份证明" prop="frsfzzmSc">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'frsfzzmSc')" :info="form.frsfzzmSc" key="frsfzzmSc" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'frsfzzmSc')" :info="form.frsfzzmSc" key="frsfzzmSc" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="近12个月依法缴纳税收的记录" prop="taxRecordIn12m">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'taxRecordIn12m')" :info="form.taxRecordIn12m" key="taxRecordIn12m" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'taxRecordIn12m')" :info="form.taxRecordIn12m" key="taxRecordIn12m" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -106,7 +106,7 @@
         <el-form-item label="国家企业信用信息公示系统查询报告" prop="publicitySystemQueryResults">
           <uploadCom
             v-if="uploadComShow"
-            @updateInfo="list => updateInfo(list, 'publicitySystemQueryResults')"
+            @updateInfo="(list) => updateInfo(list, 'publicitySystemQueryResults')"
             :info="form.publicitySystemQueryResults"
             key="publicitySystemQueryResults"
           />
@@ -117,7 +117,7 @@
           <uploadCom
             v-if="uploadComShow"
             listType="file"
-            @updateInfo="list => updateInfo(list, 'marketServicesAgreement')"
+            @updateInfo="(list) => updateInfo(list, 'marketServicesAgreement')"
             :info="form.marketServicesAgreement"
             key="marketServicesAgreement"
           />
@@ -127,7 +127,7 @@
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="服务包合同" prop="serviceContract">
-          <uploadCom v-if="uploadComShow" listType="file" @updateInfo="list => updateInfo(list, 'serviceContract')" :info="form.serviceContract" key="serviceContract" />
+          <uploadCom v-if="uploadComShow" listType="file" @updateInfo="(list) => updateInfo(list, 'serviceContract')" :info="form.serviceContract" key="serviceContract" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -135,17 +135,17 @@
 </template>
 
 <script>
-import {getDictType} from '@/api/common';
-import {getAreaTreeApi} from '@/api/areaTree';
+import { getDictType } from '@/api/common';
+import { getAreaTreeApi } from '@/api/areaTree';
 import uploadCom from './uploadCom.vue';
 import abbreviationsProvinces from '@/const/abbreviationsProvinces.js';
 
-import {mapGetters} from 'vuex';
-import {getObjDept} from '@/api/admin/dept';
-import {addObj, createAeApi, putObj, getWmdadrugentdrugtableList} from '@/api/wmdaagent';
-import {filterCodes, extractPaths} from '@/util/treeUtils.js';
+import { mapGetters } from 'vuex';
+import { getObjDept } from '@/api/admin/dept';
+import { addObj, createAeApi, putObj, getWmdadrugentdrugtableList } from '@/api/wmdaagent';
+import { filterCodes, extractPaths } from '@/util/treeUtils.js';
 export default {
-  components: {uploadCom},
+  components: { uploadCom },
   data() {
     return {
       type: 'add',
@@ -188,23 +188,26 @@ export default {
         serviceDeadline: ''
       },
       rules: {
-        gsmc: [{required: true, message: '请输入企业名称'}, {min: 1, max: 60, message: '长度在 1-60 个字符', trigger: 'blur'}],
-        skuIds: [{required: true, message: '请输入服务产品'}],
-        abbr: [{required: true, message: '请输入简称', trigger: 'blur'}],
-        provAbbrList: [{required: true, message: '请选择省份简称', trigger: 'change'}],
-        zjNumber: [{required: true, message: '请输入统一社会信用代码'}],
-        serviceDeadline: [{required: true, message: '请输入统一社会信用代码'}],
-        enableFlag: [{required: true, message: '请选择启停状态', trigger: 'change'}],
-        areaCodesData: [{required: true, message: '请选择区域', trigger: 'change'}],
-        yyzz: [{required: true, message: '请上传营业执照'}],
-        sbjnzm: [{required: true, message: '请上传社保缴纳证明'}],
-        frsfzzmZm: [{required: true, message: '请上传身份证照片（人像面）'}],
-        frsfzzmBm: [{required: true, message: '请上传身份证照片（国徽面）'}],
-        frsfzzmSc: [{required: true, message: '请上传法人手持身份证明'}],
-        taxRecordIn12m: [{required: true, message: '请上传近12个月依法缴纳税收的记录'}],
-        publicitySystemQueryResults: [{required: true, message: '请上传近12个月依法缴纳税收的记录'}],
-        marketServicesAgreement: [{required: true, message: '请上传市场服务协议'}],
-        serviceContract: [{required: true, message: '请上传服务包'}]
+        gsmc: [
+          { required: true, message: '请输入企业名称' },
+          { min: 1, max: 60, message: '长度在 1-60 个字符', trigger: 'blur' }
+        ],
+        skuIds: [{ required: true, message: '请输入服务产品' }],
+        abbr: [{ required: true, message: '请输入简称', trigger: 'blur' }],
+        provAbbrList: [{ required: true, message: '请选择省份简称', trigger: 'change' }],
+        zjNumber: [{ required: true, message: '请输入统一社会信用代码' }],
+        serviceDeadline: [{ required: true, message: '请输入统一社会信用代码' }],
+        enableFlag: [{ required: true, message: '请选择启停状态', trigger: 'change' }],
+        areaCodesData: [{ required: true, message: '请选择区域', trigger: 'change' }],
+        yyzz: [{ required: true, message: '请上传营业执照' }],
+        sbjnzm: [{ required: true, message: '请上传社保缴纳证明' }],
+        frsfzzmZm: [{ required: true, message: '请上传身份证照片（人像面）' }],
+        frsfzzmBm: [{ required: true, message: '请上传身份证照片（国徽面）' }],
+        frsfzzmSc: [{ required: true, message: '请上传法人手持身份证明' }],
+        taxRecordIn12m: [{ required: true, message: '请上传近12个月依法缴纳税收的记录' }],
+        publicitySystemQueryResults: [{ required: true, message: '请上传近12个月依法缴纳税收的记录' }],
+        marketServicesAgreement: [{ required: true, message: '请上传市场服务协议' }],
+        serviceContract: [{ required: true, message: '请上传服务包' }]
       }
     };
   },
@@ -217,7 +220,7 @@ export default {
   methods: {
     async editShow(row) {
       await this.getDict();
-      await getAreaTreeApi().then(res => (this.treeList = res.data.data));
+      await getAreaTreeApi().then((res) => (this.treeList = res.data.data));
       const areaCodes = row.areaCodes;
       const treeList = JSON.parse(JSON.stringify(this.treeList));
       const currTree = filterCodes(areaCodes, treeList);
@@ -233,14 +236,14 @@ export default {
       this.uploadComShow = true;
     },
     getDict() {
-      getDictType({type: 'enable_disabled'}).then(res => (this.enableDisabledList = res.data.data));
-      getAreaTreeApi().then(res => (this.treeList = res.data.data));
+      getDictType({ type: 'enable_disabled' }).then((res) => (this.enableDisabledList = res.data.data));
+      getAreaTreeApi().then((res) => (this.treeList = res.data.data));
       const deptId = this.userInfo.deptId;
-      getObjDept(deptId).then(data => {
+      getObjDept(deptId).then((data) => {
         var deptInfo = data.data.data;
         this.entLevel = deptInfo.level;
       });
-      getWmdadrugentdrugtableList().then(res => {
+      getWmdadrugentdrugtableList().then((res) => {
         this.drugtableList = res.data.data;
         console.log('drugtableList', this.drugtableList);
       });
@@ -252,11 +255,10 @@ export default {
     },
     submitFn(extDrugEntId, type) {
       this.type = type;
-      this.$refs.formRef.validate(valid => {
+      this.$refs.formRef.validate((valid) => {
         if (valid) {
           this.submitInfo(extDrugEntId);
         } else {
-          console.log('error submit!!');
           return false;
         }
       });
@@ -266,6 +268,8 @@ export default {
       this.uploadComShow = false;
     },
     async submitInfo(extDrugEntId) {
+      console.log('123');
+
       if (this.entLevel > 3) {
         this.$message.error('二级代理商不能添加代理商');
         this.$emit('setLoading', false);
@@ -287,6 +291,7 @@ export default {
             this.$message.success('添加成功');
           }
         } else if (this.type === 'edit') {
+          obj.skuIds = obj?.skuIds?.join(',');
           const res = await putObj(obj);
           if (res.data.code === 0) {
             this.$message.success('更新成功');
@@ -295,6 +300,8 @@ export default {
         this.$emit('setLoading', false);
         this.$emit('success');
       } catch (err) {
+
+
         this.$emit('setLoading', false);
       }
     }

src/views/admin/wmdaagent/components/ATform.vue

@@ -43,12 +43,12 @@
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="身份证照片（人像面）" prop="frsfzzmZm">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'frsfzzmZm')" :info="form.frsfzzmZm" key="frsfzzmZm" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'frsfzzmZm')" :info="form.frsfzzmZm" key="frsfzzmZm" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="身份证照片（国徽面）" prop="frsfzzmBm">
-          <uploadCom v-if="uploadComShow" @updateInfo="list => updateInfo(list, 'frsfzzmBm')" :info="form.frsfzzmBm" key="frsfzzmBm" />
+          <uploadCom v-if="uploadComShow" @updateInfo="(list) => updateInfo(list, 'frsfzzmBm')" :info="form.frsfzzmBm" key="frsfzzmBm" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -56,16 +56,16 @@
 </template>
 
 <script>
-import {getDictType} from '@/api/common';
-import {getAreaTreeApi} from '@/api/areaTree';
+import { getDictType } from '@/api/common';
+import { getAreaTreeApi } from '@/api/areaTree';
 import uploadCom from './uploadCom.vue';
-import {mapGetters} from 'vuex';
-import {getObjDept} from '@/api/admin/dept';
-import {addObj, putObj} from '@/api/wmdaagent';
-import {filterCodes, extractPaths} from '@/util/treeUtils.js';
+import { mapGetters } from 'vuex';
+import { getObjDept } from '@/api/admin/dept';
+import { addObj, putObj } from '@/api/wmdaagent';
+import { filterCodes, extractPaths } from '@/util/treeUtils.js';
 import abbreviationsProvinces from '@/const/abbreviationsProvinces.js';
 export default {
-  components: {uploadCom},
+  components: { uploadCom },
   data() {
     return {
       uploadComShow: false,
@@ -92,14 +92,17 @@ export default {
         frsfzzmBm: ''
       },
       rules: {
-        gsmc: [{required: true, message: '请输入团队名称'}, {min: 1, max: 60, message: '长度在 1-60 个字符', trigger: 'blur'}],
-        abbr: [{required: true, message: '请输入简称', trigger: 'blur'}],
-        provAbbrList: [{required: true, message: '请选择省份简称', trigger: 'change'}],
-        zjNumber: [{required: true, message: '请输入负责人身份证号码'}],
-        enableFlag: [{required: true, message: '请选择启停状态', trigger: 'change'}],
-        areaCodesData: [{required: true, message: '请选择区域', trigger: 'change'}],
-        frsfzzmZm: [{required: true, message: '请上传身份证照片（人像面）'}],
-        frsfzzmBm: [{required: true, message: '请上传身份证照片（国徽面）'}]
+        gsmc: [
+          { required: true, message: '请输入团队名称' },
+          { min: 1, max: 60, message: '长度在 1-60 个字符', trigger: 'blur' }
+        ],
+        abbr: [{ required: true, message: '请输入简称', trigger: 'blur' }],
+        provAbbrList: [{ required: true, message: '请选择省份简称', trigger: 'change' }],
+        zjNumber: [{ required: true, message: '请输入负责人身份证号码' }],
+        enableFlag: [{ required: true, message: '请选择启停状态', trigger: 'change' }],
+        areaCodesData: [{ required: true, message: '请选择区域', trigger: 'change' }],
+        frsfzzmZm: [{ required: true, message: '请上传身份证照片（人像面）' }],
+        frsfzzmBm: [{ required: true, message: '请上传身份证照片（国徽面）' }]
       }
     };
   },
@@ -113,7 +116,7 @@ export default {
   methods: {
     async editShow(row) {
       await this.getDict();
-      await getAreaTreeApi().then(res => (this.treeList = res.data.data));
+      await getAreaTreeApi().then((res) => (this.treeList = res.data.data));
       const areaCodes = row.areaCodes;
       const treeList = JSON.parse(JSON.stringify(this.treeList));
       const currTree = filterCodes(areaCodes, treeList);
@@ -127,10 +130,10 @@ export default {
       this.uploadComShow = true;
     },
     getDict() {
-      getDictType({type: 'enable_disabled'}).then(res => (this.enableDisabledList = res.data.data));
-      getAreaTreeApi().then(res => (this.treeList = res.data.data));
+      getDictType({ type: 'enable_disabled' }).then((res) => (this.enableDisabledList = res.data.data));
+      getAreaTreeApi().then((res) => (this.treeList = res.data.data));
       const deptId = this.userInfo.deptId;
-      getObjDept(deptId).then(data => {
+      getObjDept(deptId).then((data) => {
         var deptInfo = data.data.data;
         this.entLevel = deptInfo.level;
       });
@@ -142,7 +145,7 @@ export default {
     },
     submitFn(extDrugEntId, type) {
       this.type = type;
-      this.$refs.formRef.validate(valid => {
+      this.$refs.formRef.validate((valid) => {
         if (valid) {
           this.submitInfo(extDrugEntId);
           this.$emit('setLoading', true);
@@ -177,6 +180,7 @@ export default {
           this.$message.success('添加成功');
         }
       } else if (this.type === 'edit') {
+        obj.skuIds = obj.skuIds?.split(',');
         const res = await putObj(obj);
         if (res.data.code === 0) {
           this.$message.success('更新成功');

src/views/admin/wmdaagent/components/addDialog.vue

@@ -26,7 +26,7 @@
 import ATform from './ATform.vue';
 import AEform from './AEform.vue';
 export default {
-  components: {ATform, AEform},
+  components: { ATform, AEform },
   data() {
     return {
       loading: false,
@@ -42,8 +42,6 @@ export default {
   },
   methods: {
     editFn(row) {
-      console.log('ROW', row);
-
       this.type = 'edit';
       this.title = '编辑';
       this.isDisabled = true;
@@ -71,6 +69,7 @@ export default {
       this.extDrugEntId = extDrugEntId;
     },
     handleClose() {
+      this.loading = false;
       if (this.$refs.ATformRef) {
         this.$refs.ATformRef.restForm();
       }
@@ -101,6 +100,7 @@ export default {
       if (this.$refs.ATformRef) {
         this.$refs.ATformRef.submitFn(this.extDrugEntId, this.type);
       }
+
       if (this.$refs.AEformRef) {
         this.$refs.AEformRef.submitFn(this.extDrugEntId, this.type);
       }