修复bug

src/Form/publicManage/add.vue

@@ -151,6 +151,9 @@ export default {
       console.log(this.authData);
     },
     onSubmit () {
+      this.form.isdefault = this.form.aa
+      this.form.isused = this.form.bb
+      console.log("表单数据一",this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         if (!this.authData) {
@@ -179,6 +182,7 @@ export default {
             }
           })
         } else {
+          console.log(this.form,"表单数据")
           const res = await this.$api.requested({
             "id": "20221009100502",
             "version": 1,

src/Form/publicManage/edit.vue

@@ -51,6 +51,22 @@
               <div><el-input size="mini" style="width:50px;margin-right:10px" v-model="form.deallimit" />天，未成交，自动回收至公海，负责人清空</div>
             </div>
           </el-form-item>
+            <el-form-item label="是否默认公海" prop="aa">
+              <div>
+                <el-radio-group v-model="form.aa" :disabled="form.isdefault === 1">
+                  <el-radio :label="1">开启</el-radio>
+                  <el-radio :label="0" >关闭</el-radio>
+                </el-radio-group>
+              </div>
+            </el-form-item>
+            <el-form-item label="是否启用" prop="isused">
+              <div>
+                <el-radio-group v-model="form.isused">
+                  <el-radio :label="1">开启</el-radio>
+                  <el-radio :label="0">关闭</el-radio>
+                </el-radio-group>
+              </div>
+            </el-form-item>
           </el-col>
         </el-form>
          <el-alert
@@ -84,6 +100,7 @@ export default {
       defaultData: [],
       dataid: '',
       form: {
+        "aa":0,
         "sa_customerpoolid": 0,
         "poolname": "", //池名称
         "freeget": 0, //自由领取
@@ -112,6 +129,12 @@ export default {
         isopentenure: [
           { required: true, message: '请输入数据', trigger: 'blur' }
         ],
+        aa: [
+          { required: true, message: '请选择', trigger: 'blur' }
+        ],
+        isused: [
+          { required: true, message: '请选择', trigger: 'blur' }
+        ],
       }
     }
   },
@@ -127,7 +150,7 @@ export default {
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
       console.log(this.form);
-      
+      this.form.aa = this.form.isdefault
       this.getdefaultData()
     },
     async getdefaultData () {
@@ -145,6 +168,7 @@ export default {
       console.log(this.authData);
     },
     onSubmit () {
+      this.form.isdefault = this.form.aa
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         if (!this.authData) {

src/HDrpManagement/publicCustomer/index.vue

@@ -91,10 +91,10 @@
           <span v-else>未分配</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'contact'">
-          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:''}}</span>
+          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:'--'}}</span>
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
     </basicLayout>

src/HDrpManagement/publicManage/index.vue

@@ -17,8 +17,8 @@ vue
       </template>
       <template v-slot:tbOpreation="scope">
 <!--        <delete-btn class="inline-16" @deleteSuccess="$refs.basicLayout.listData()" :id="scope.data.data.sa_customerpoolid" nameId="20221009100602" nameKey="sa_customerpoolids" />-->
-        <delBtn class="inline-16"></delBtn>
-        <editTemp class="inline-16" :data="scope.data.data"></editTemp>
+        <delBtn class="inline-16" :data="scope.data.data" @delSuccess="$refs.basicLayout.listData()" ></delBtn>
+        <editTemp class="inline-16" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()"></editTemp>
       </template>
     </basicLayout>
   </div>

src/HDrpManagement/publicManage/modules/delBtn.vue

@@ -1,12 +1,47 @@
 <template>
   <div>
-    <el-button type="text" size="mini">删 除</el-button>
+    <el-button type="text" size="mini" @click="dialogVisible = true" :disabled="data.isdefault === 1">删 除</el-button>
+    <el-dialog
+        title="删除公海池"
+        :visible.sync="dialogVisible"
+        width="30%"
+        append-to-body
+        >
+      <span>一旦删除该公海池，将删除该公海池的所有线索，是否确认删除该公海池</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+    <el-button type="primary" size="small" @click="onSubmit">确 定</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
-  name: "delBtn"
+  name: "delBtn",
+  props:["data"],
+  data(){
+    return {
+      dialogVisible:false
+    }
+  },
+  methods:{
+    async onSubmit(){
+      console.log("删除",this.id)
+      const res = await this.$api.requested({
+        "id": 20221009100602,
+        "content": {
+          "sa_customerpoolids": [
+            this.data.sa_customerpoolid
+          ]
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogVisible = false
+        this.$emit("delSuccess")
+      })
+    }
+  }
 }
 </script>
 

src/HManagement/clueManage/clue_import/detailPage/index.vue

@@ -162,16 +162,16 @@ export default {
           },
         ],
         systemInfo: [
-          {label:'创建人',value:this.mainData.createBy},
-          {label:'分配人',value:this.mainData.assignedBy},
-          {label:'最近跟进人',value:this.mainData.followBy},
-          {label:'转移人',value:this.mainData.changeBy},
-          {label:'最近编辑人',value:this.mainData.editBy},
-          {label:'创建时间',value:this.mainData.createDate},
-          {label:'分配时间',value:this.mainData.assignedDate},
-          {label:'最近跟进时间',value:this.mainData.followDate},
-          {label:'最近转移时间',value:this.mainData.changeDate},
-          {label:'最近编辑时间',value:this.mainData.editDate},
+          {label:'创建人',value:this.mainData.createby},
+          {label:'分配人',value:this.mainData.assignedby},
+          {label:'最近跟进人',value:this.mainData.followby},
+          {label:'转移人',value:this.mainData.changeby},
+          {label:'最近编辑人',value:this.mainData.editby},
+          {label:'创建时间',value:this.mainData.createdate},
+          {label:'分配时间',value:this.mainData.assigneddate},
+          {label:'最近跟进时间',value:this.mainData.followdate},
+          {label:'最近转移时间',value:this.mainData.changedate},
+          {label:'最近编辑时间',value:this.mainData.editdate},
         ]
       }
     },

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -120,10 +120,10 @@
           <span v-else>未分配</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'contact'">
-          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:''}}</span>
+          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:'--'}}</span>
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
     </basicLayout>