代码上传

src/Form/publicCustomer/add.vue

@@ -76,7 +76,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户等级:" prop="grade">
-                <el-select v-model="form.grade" placeholder="请选择客户等级" size="small">
+                <el-select v-model="form.customergrade" placeholder="请选择客户等级" size="small">
                   <el-option
                     v-for="item in customerLead()"
                     :key="item.rowindex"
@@ -117,13 +117,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" prop="province">
+              <el-form-item label="省市县:" >
                 <el-cascader
-                  size="small"
-                  v-model="form.province"
-                  :options="arealist()"
-                  @change="cascaderChange"
-                  ref="cascader">
+                    style="width: 100%"
+                    v-model="value"
+                    :options="basicData.data().areaData"
+                    @change="cascaderChange" clearable>
                 </el-cascader>
               </el-form-item>
             </el-col>
@@ -181,6 +180,7 @@ export default {
         "sys_enterpriseid": 0, //合作企业档案ID，新增是传0，更新
         "enterprisename":"",//客户名称（企业名称）
         "type": "", //客户类型
+        "customergrade":'',//客户等级
         "sa_customerpoolid": '', //客户池（公海池）ID,默认或没有的时候传0
         "source": "", //客户来源
         "province":"",//非必填，可选
@@ -195,6 +195,7 @@ export default {
         "phonenumber":"",//非必填，可选
         "ispublic":1
       },
+      value:'',
       rules:{
         enterprisename:[
           { required: true, message: '输入客户名称', trigger: 'blur'},
@@ -296,11 +297,11 @@ export default {
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
-        if (this.form.province) {
+        /*if (this.form.province) {
           this.form.city = this.form.province[1]
           this.form.county = this.form.province[2]
           this.form.province = this.form.province[0]
-        }
+        }*/
         const res = await this.$api.requested({
           "id": "20221010164302",
           "version":1,
@@ -399,9 +400,13 @@ export default {
       this.dialogFormVisible = false
       this.checkResults = ''
     },
-    cascaderChange() {
+    cascaderChange (val) {
+      if (val.length === 1)
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
-    }
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+
+    },
   }
 }
 </script>

src/Form/publicCustomer/edit.vue

@@ -114,12 +114,18 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="省市县:" prop="province">
-                <el-cascader
+<!--                <el-cascader
                   size="small"
                   v-model="form.province"
                   :options="arealist()"
                   @change="cascaderChange"
                   ref="cascader">
+                </el-cascader>-->
+                <el-cascader
+                    style="width: 100%"
+                    v-model="form.value"
+                    :options="basicData.data().areaData"
+                    @change="cascaderChange" clearable>
                 </el-cascader>
               </el-form-item>
             </el-col>
@@ -171,7 +177,9 @@ export default {
       businessShow:false,
       total:0,
       currentPage:0,
+      value:'',
       form:{
+        "value":[],
         "sa_customersid": 0,//新增是传0
         "parentid": 0, //上级客户ID,默认或没有上级的时候传0
         "sys_enterpriseid": 0, //合作企业档案ID，新增是传0，更新
@@ -208,7 +216,13 @@ export default {
   methods:{
     editBtn () {
       this.dialogFormVisible = true
+      let arr = ['province','city','county']
+      arr.forEach(e=>{
+        this.data[e] !== '' ?this.form.value.push(this.data[e]):''
+      })
+     /* this.form = Object.assign({},this.form,this.data)*/
       this.form = Object.assign({},this.form,this.data)
+
     },
     /*工商查询*/
     async businessSearch(){
@@ -332,9 +346,13 @@ export default {
       this.dialogFormVisible = false
       this.checkResults = ''
     },
-    cascaderChange() {
+    cascaderChange (val) {
+      if (val.length === 1)
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
-    }
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+
+    },
   }
 }
 </script>

src/HDrpManagement/competitor/detail/index.vue

@@ -9,7 +9,7 @@
         turnPageId="20221018164302"
         idname="sa_competitorid"
         :tags="[]"
-        :tabs="['详细信息','项目商机','联系人','地址管理']"
+        :tabs="['详细信息','参与竞争项目','联系人','地址管理']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -128,7 +128,7 @@
             label="数量"
             width="180">
           <template slot-scope="scope">
-            <el-input-number disabled v-model="scope.row.qty" size="mini" :min="1"  label="描述文字"></el-input-number>
+            <p><span>{{scope.row.qty?scope.row.qty:'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column

src/HDrpManagement/projectTask/index.vue

@@ -46,50 +46,70 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'projtaskmag_options'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
-            <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" style="height: 40px;line-height: 40px;vertical-align: center;margin-top:-5px;margin-bottom: -5px">
-              {{item.optionname?item.optionname:'--'}}
+            <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" class="option-name-style">
+              <span class="text-left">
+                {{item.optionname?item.optionname:'--'}}
+              </span>
+
+            </div>
+            <div v-else-if="index === 0" class="option-name-style-line">
+              <span class="text-left">
+                {{item.optionname?item.optionname:'--'}}
+              </span>
             </div>
-            <div v-else-if="index === 0" style="height: 40px;line-height: 40px;vertical-align: center;margin-top: -5px">
-              {{item.optionname?item.optionname:'--'}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
+            <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" class="option-name-style-line">
+              <span class="text-left">
+                {{item.optionname?item.optionname:'--'}}
+              </span>
             </div>
-            <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" style="height: 40px;line-height: 40px;vertical-align: center;">
-              {{item.optionname?item.optionname:'--'}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
+            <div v-else class="option-name-style">
+              <span class="text-left">
+                {{item.optionname?item.optionname:'--'}}
+              </span>
             </div>
-            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.optionname?item.optionname:'--'}}</div>
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'remarks'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
-            <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" style="height: 40px;line-height: 40px;vertical-align: center;margin-top:-5px;margin-bottom: -5px">
-              {{item.remarks?item.remarks:'--'}}
-            </div>
-            <div v-else-if="index === 0" style="height: 40px;line-height: 40px;vertical-align: center;margin-top: -5px">
-              {{item.remarks?item.remarks:'--'}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
-            </div>
-            <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" style="height: 40px;line-height: 40px;vertical-align: center;">
-              {{item.remarks?item.remarks:'--'}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
-            </div>
-            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.remarks?item.remarks:'--'}}</div>
+            <el-tooltip class="item" effect="light" :content="item.remarks" placement="bottom">
+              <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" class="remarks-style">
+                <span class="text-left">{{item.remarks?item.remarks:'--'}}</span>
+              </div>
+              <div v-else-if="index === 0" class="remarks-style-line">
+                <span class="text-left">{{item.remarks?item.remarks:'--'}}</span>
+              </div>
+              <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" class="remarks-style-line">
+                <span class="text-left">{{item.remarks?item.remarks:'--'}}</span>
+              </div>
+              <div v-else class="remarks-style">
+                <span class="text-left">{{item.remarks?item.remarks:'--'}}</span>
+              </div>
+            </el-tooltip>
+
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'score'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
-            <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" style="height: 40px;line-height: 40px;vertical-align: center;margin-top:-5px;margin-bottom: -5px">
-              {{item.score}}
+            <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" class="score-style">
+              <span class="text-left">
+                {{item.score}}
+              </span>
             </div>
-            <div v-else-if="index === 0" style="height: 40px;line-height: 40px;vertical-align: center;margin-top: -5px">
-              {{item.score}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
+            <div v-else-if="index === 0" class="score-style-line">
+              <span class="text-left">
+                {{item.score}}
+              </span>
             </div>
-            <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" style="height: 40px;line-height: 40px;vertical-align: center;">
-              {{item.score}}
-              <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
+            <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" class="score-style-line">
+              <span class="text-left">
+                {{item.score}}
+              </span>
+            </div>
+            <div v-else class="score-style">
+              <span class="text-left">
+                {{item.score}}
+              </span>
             </div>
-            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.score}}</div>
           </div>
         </div>
         <div v-else>
@@ -118,5 +138,64 @@ export default {
 </script>
 
 <style scoped>
-
+  .option-name-style{
+    height: 40px;
+    line-height: 40px;
+    vertical-align: center;
+    margin-top:-5px;
+    margin-bottom: -5px;
+    transform: scale(1.05,1)
+  }
+  .option-name-style-line{
+    height: 40px;
+    line-height: 40px;
+    vertical-align: center;
+    margin-top:-5px;
+    margin-bottom: -5px;
+    border-bottom: 1px solid #ebeef5;
+    transform: scale(1.05,1);
+  }
+  .remarks-style{
+    width:100%;
+    height: 39px;
+    line-height: 39px;
+    vertical-align: center;
+    margin-top:-5px;
+    margin-bottom: -5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    transform: scale(1.05,1)
+  }
+  .remarks-style-line{
+    border-bottom: 1px solid #ebeef5;
+    transform: scale(1.05,1);
+    width:100%;height: 40px;
+    line-height: 40px;
+    vertical-align: center;
+    margin-top: -5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .score-style{
+    height: 40px;
+    line-height: 40px;
+    vertical-align: center;
+    margin-top:-5px;
+    margin-bottom: -5px;
+    transform: scale(1.05,1)
+  }
+  .score-style-line{
+    height: 40px;
+    line-height: 40px;
+    vertical-align: center;
+    margin-top:-5px;
+    margin-bottom: -5px;
+    border-bottom: 1px solid #ebeef5;
+    transform: scale(1.05,1)
+  }
+  .text-left{
+    margin-left: 8px !important;
+  }
 </style>