2023-6-1

src/Form/salerPrivatecustomer/add.vue

@@ -255,7 +255,7 @@
         <el-button size="small" @click="onClose" class="normal-btn-width inline-16">取 消</el-button>
 <!--        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>-->
         <duplicateCheck ref="check" :data="form" @onSuccess="onClose"></duplicateCheck>
-        <el-button size="small" type="primary" @click="onSave" class="normal-btn-width">确 定</el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="onSave" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
     <enterprise
@@ -367,7 +367,8 @@ export default {
   },
   computed:{
     ...mapGetters({
-      dataToForm:'dataToForm'
+      dataToForm:'dataToForm',
+      loading:'loading'
     })
   },
   methods:{
@@ -449,7 +450,10 @@ export default {
      this.$refs.form.validate((valid) => {
        if (!valid) return false
        this.$refs.check.creatShow = true
-       this.$refs.check.queryRule()
+       this.$store.commit('setLoading',true)
+       this.$refs.check.queryRule(() => {
+        this.$store.commit('setLoading',false)
+       })
      })
     },
     onClose () {

src/HDrpManagement/collectionRule/index.vue

@@ -69,7 +69,7 @@ export default {
     async listData(){
       const res = await this.$api.requested(this.params)
       this.list = res.data
-      this.total = res.total
+      this.total = res.pageTotal
       console.log(this.list)
     },
     handleSizeChange(val) {

src/HDrpManagement/workReport/modules/createReport/index.vue

@@ -18,9 +18,10 @@
       size="800px">
       <div class="drawer__panel" v-if="drawer">
         <template v-for="item in detail">
-          <div :style="{'display':item.editable ? 'block' : 'none','margin-bottom':'40px'}">
+          <!-- <div :style="{'display':item.editable ? 'block' : 'none','margin-bottom':'40px'}"> -->
+          <div :style="{'margin-bottom':'40px'}">
             <p class="normal-title" style="margin-bottom:20px">{{ item.title }}</p>
-            <p ref="content" contenteditable="true" class="content">
+            <p ref="content" :contenteditable="item.editable ? true : false" class="content" :style="!item.editable ? 'background:#FAFAFA' : ''">
               <template v-for="item2 in item.content">
                 {{ item2.content }}<br/>
               </template>

src/HManagement/personalTarget/target/modules/edit/index.vue

@@ -163,7 +163,10 @@ export default {
         this.errorurl = null
       }
       if (this.errorurl) {
-        this.$message('导入失败请查看错误文件')
+        this.$message({
+          message:'导入失败请查看错误文件',
+          type:'warning'
+        })
       } else {
         this.tool.showMessage(res1,()=>{
           this.mainData()

src/components/duplicatesCheck/customerCheck.vue

@@ -203,7 +203,7 @@ export default {
       this.listData()
     },
     /*查询规则*/
-    async queryRule(){
+    async queryRule(callback){
       const res = await this.$api.requested({
         "id": "20230410090502",
         "content": {},
@@ -212,6 +212,7 @@ export default {
       this.fields2 = res.data.custcheckrule.fields2
       this.fields3 = res.data.custcheckrule.fields3
       this.listData()
+      callback && callback()
     }
   },
   created() {

src/store/index.js

@@ -54,6 +54,9 @@ export default new Vuex.Store({
     
   },
   mutations: {
+    setLoading(state,value) {
+      state.loading = value
+    },
     setSiteInfo(state,res) {
       state.siteinfo = res.data
     },