Parcourir la source

2022-12-13 11:00

codeMan il y a 2 ans
Parent
commit
5ef66e4501
28 fichiers modifiés avec 439 ajouts et 118 suppressions
  1. 3 3
      src/HDrpManagement/contractManage/index.vue
  2. 91 5
      src/HDrpManagement/contractManage/modules/detail.vue
  3. 6 10
      src/HDrpManagement/projectChange/index.vue
  4. 23 10
      src/HDrpManagement/projectChange/modules/detail.vue
  5. 12 2
      src/HDrpManagement/publicCustomer/index.vue
  6. 51 1
      src/HDrpManagement/publicCustomer/modules/detail.vue
  7. 4 1
      src/HManagement/clueManage/clue_import/detailPage/index.vue
  8. 2 2
      src/HManagement/clueManage/clue_import/index.vue
  9. 9 5
      src/HManagement/clueManage/clue_private/index.vue
  10. 21 7
      src/HManagement/clueManage/clue_private/modules/detail.vue
  11. 0 32
      src/HManagement/clueManage/clue_public/modules/detail.vue
  12. 9 6
      src/HManagement/clueManage/m_activity/modules/addClue.vue
  13. 12 2
      src/HManagement/clueManage/m_activity/modules/detailTable.vue
  14. 10 11
      src/HManagement/clueManage/m_activity/modules/editClue.vue
  15. 3 2
      src/HManagement/personalTarget/target/index.vue
  16. 19 1
      src/HManagement/personalTarget/target/modules/edit/index.vue
  17. 3 2
      src/HManagement/projectTarget/target/index.vue
  18. 19 1
      src/HManagement/projectTarget/target/modules/edit/index.vue
  19. 3 1
      src/HManagement/salesForecastTemplate/index.vue
  20. 22 1
      src/HManagement/salesForecastTemplate/modules/modelDetail.vue
  21. 22 0
      src/SDrpManagement/QuotedPrice/detail/index.vue
  22. 5 0
      src/SDrpManagement/QuotedPrice/index.vue
  23. 39 2
      src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue
  24. 10 0
      src/SDrpManagement/salerPrivatecustomer/index.vue
  25. 11 4
      src/SManagement/orderclue/components/file/index2.vue
  26. 5 5
      src/SManagement/orderclue/index.vue
  27. 3 1
      src/SManagement/sales_forecast/index.vue
  28. 22 1
      src/SManagement/sales_forecast/modules/modelDetail.vue

+ 3 - 3
src/HDrpManagement/contractManage/index.vue

@@ -69,9 +69,9 @@
 
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span v-if="scope.data.column.data[[scope.data.column.columnname]]=='审核'" style="color: rgb(82, 196, 26);">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]]=='提交'" style="color: red;">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'type'">
           <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '框架'">经销商合作协议</span>

+ 91 - 5
src/HDrpManagement/contractManage/modules/detail.vue

@@ -208,6 +208,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainData.type == '项目' 
         ? this.mainData.typemx == '直销' 
           ? this.mainAreaData = [
@@ -262,7 +263,24 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
+            style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+                case '新建':
+                  style = {color:'#3874f6'}
+                  break;
+                case '提交':
+                  style = {color:'#52c41a'}
+                  break;
+                case '审核':
+                  style = {color:'#333333'}
+                  break;
+                default:
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'合同描述',
@@ -320,7 +338,24 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
+            style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+                case '新建':
+                  style = {color:'#3874f6'}
+                  break;
+                case '提交':
+                  style = {color:'#52c41a'}
+                  break;
+                case '审核':
+                  style = {color:'#333333'}
+                  break;
+                default:
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'合同描述',
@@ -379,7 +414,24 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
+            style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+                case '新建':
+                  style = {color:'#3874f6'}
+                  break;
+                case '提交':
+                  style = {color:'#52c41a'}
+                  break;
+                case '审核':
+                  style = {color:'#333333'}
+                  break;
+                default:
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'合同描述',
@@ -434,7 +486,24 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
+            style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+                case '新建':
+                  style = {color:'#3874f6'}
+                  break;
+                case '提交':
+                  style = {color:'#52c41a'}
+                  break;
+                case '审核':
+                  style = {color:'#333333'}
+                  break;
+                default:
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'合同描述',
@@ -492,7 +561,24 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
+            style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+                case '新建':
+                  style = {color:'#3874f6'}
+                  break;
+                case '提交':
+                  style = {color:'#52c41a'}
+                  break;
+                case '审核':
+                  style = {color:'#333333'}
+                  break;
+                default:
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'合同描述',

+ 6 - 10
src/HDrpManagement/projectChange/index.vue

@@ -93,17 +93,13 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-<!--        <div
-          v-if="scope.data.column.columnname == 'grade'"
-        >
-          <p v-if="scope.data.column.data[scope.data.column.columnname] !== ''">
-            {{projectLead&&projectLead.find(item => item.rowindex==scope.data.column.data[scope.data.column.columnname]) && projectLead.find(item => item.rowindex==scope.data.column.data[scope.data.column.columnname]).value}}
-          </p>
-          <p v-else>&#45;&#45;</p>
-        </div>-->
-        <div v-if="scope.data.column.data[scope.data.column.columnname] && scope.data.column.columnname != 'operation'">{{scope.data.column.data[[scope.data.column.columnname]]}}</div>
+        <div v-if="scope.data.column.columnname === 'status'">
+          <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
         <div v-else>
-          --
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">

+ 23 - 10
src/HDrpManagement/projectChange/modules/detail.vue

@@ -16,10 +16,9 @@
 <!--    <tagPanl slot="tags" :data="tagObj" ownertable="sa_project" :id="mainData.sa_projectid" @onSuccess="queryMainData"/>-->
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
-      <div  style="display: inline-block !important;">
+      <div style="margin-right: 10px" class="inline-16" v-if="tool.checkAuth($route.name,'put') && flagTag !== ''">
         <putPeople
-            @putSuccess="putSuccess"
-            v-if="flagTag !== ''"
+            @putSuccess="queryMainData"
             :rowData="mainData"
             :flagTag="flagTag"
             style="width:100%;"
@@ -33,13 +32,12 @@
             style="width:100%;"
         />
       </div>-->
-      <div >
+      <div style="margin-right: 10px" class="inline-16" v-if="tool.checkAuth($route.name,'delete') ">
         <Del
             :id="mainData.sa_projectid"
             :nameId="20221020144302"
             nameKey="sa_projectids"
             class="inline-16"
-            v-if="tool.checkAuth($route.name,'delete') "
             @deleteSuccess="deleteSuccess"
         />
       </div>
@@ -305,6 +303,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure () {
+      let that = this
       this.detailInfo = {
         baseInfo: [
           {label:'项目编号',value:this.mainData.projectnum ? this.mainData.projectnum : '--'},
@@ -367,11 +366,25 @@ export default {
         },
         {
           label:'项目状态',
-          value: this.mainData.status
-        },
-        {
-          label:'项目状态',
-          value: this.mainData.enterprisename
+          value: this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.tradingstatus) {
+              case '已成交':
+                style = {color:'#fa8c16'}
+                break;
+              case '跟进中':
+                style = {color:'#52c41a'}
+                break;
+              case '已失败':
+                style = {color:'#999999'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
         {
           label:'负责人',

+ 12 - 2
src/HDrpManagement/publicCustomer/index.vue

@@ -88,12 +88,22 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'isleader'">
-          <span v-if="scope.data.column.data['leader'].length !== 0">已分配</span>
-          <span v-else>未分配</span>
+          <span style="color:#333333" v-if="scope.data.column.data['leader'].length !== 0">已分配</span>
+          <span style="color:#3874f6" 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>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'status'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>

+ 51 - 1
src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -162,6 +162,7 @@ export default {
       this.queryMainData(id)
     },
     changeDataStructure () {
+      let that = this
       this.mainAreaData = [
         {
           label:'客户编号',
@@ -181,7 +182,56 @@ export default {
         },
         {
           label:'成交状态',
-          value:this.mainData.tradingstatus
+          value:this.mainData.tradingstatus,
+          style:function () {
+            let style = {}
+            switch (that.mainData.tradingstatus) {
+              case '已成交':
+                style = {color:'#fa8c16'}
+                break;
+              case '未成交':
+                style = {color:'#3874f6'}
+                break;
+              case '多次成交':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
+        },
+        {
+          label:'合作状态',
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '潜在':
+                style = {color:'#3874f6'}
+                break;
+              case '合作中':
+                style = {color:'#52c41a'}
+                break;
+              case '已终止':
+                style = {color:'#999999'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
+        },
+        {
+          label:'分配状态',
+          value:this.mainData['leader'].length !== 0 ? '已分配' : '待分配',
+          style:function () {
+            let style = {}
+            style = that.mainData['leader'].length !== 0  ? {color:'#333333'} : {color:'#3874f6'}
+            return style
+          }
         },
         {
           label:'负责人',

+ 4 - 1
src/HManagement/clueManage/clue_import/detailPage/index.vue

@@ -104,7 +104,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '待审核':
-                style = {color: 'rgb(82, 196, 26)'}
+                style = {color: '#3874f6'}
+                break;
+              case '已审核':
+                style = {color: '#333333'}
                 break;
               default:
                 break;

+ 2 - 2
src/HManagement/clueManage/clue_import/index.vue

@@ -39,8 +39,8 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color: rgb(82, 196, 26)" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}

+ 9 - 5
src/HManagement/clueManage/clue_private/index.vue

@@ -50,13 +50,17 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#cccccc" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#FA8C16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#F60909" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#BBBBBB" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '无效'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已无效'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已转化'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'allocationstatus'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '待分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'province'">
           <span>{{scope.data.column.data.province}}-{{scope.data.column.data.city}}-{{scope.data.column.data.county}}</span>
         </div>

+ 21 - 7
src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -144,19 +144,19 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '已过期':
-                style = {color:'#333'}
+                style = {color:'#999999'}
                 break;
               case '跟进中':
-                style = {color:'#52C41A'}
+                style = {color:'#52c41a'}
                 break;
               case '待跟进':
-                style = {color:'#FA8C16'}
+                style = {color:'#3874f6'}
                 break;
-              case '已成交':
-                style = {color:'#F60909'}
+              case '已转化':
+                style = {color:'#fa8c16'}
                 break; 
-              case '无效':
-                style = {color:'#BBBBBB'}
+              case '无效':
+                style = {color:'#333333'}
                 break; 
               default:
                 break;
@@ -168,6 +168,20 @@ export default {
         {
           label:'分配状态',
           value:this.mainData.allocationstatus,
+          style:function () {
+            let style = {}
+            switch (that.mainData.allocationstatus) {
+              case '已分配':
+                style = {color:'#333333'}
+                break;
+              case '待分配':
+                style = {color:'#3874f6'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
 
         },
       ]

+ 0 - 32
src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -195,38 +195,6 @@ export default {
           label:'负责人',
           value:this.mainData.leader ? this.mainData.leader[0].name : ''
         },
-        {
-          label:'分配状态',
-          value:this.mainData.allocationstatus
-        },
-        {
-          label:'跟进状态',
-          value:this.mainData.status,
-          style:function () {
-            let style = {}
-            switch (that.mainData.status) {
-              case '已过期':
-                style = {color:'#333'}
-                break;
-              case '跟进中':
-                style = {color:'#52C41A'}
-                break;
-              case '待跟进':
-                style = {color:'#FA8C16'}
-                break;
-              case '已成交':
-                style = {color:'#F60909'}
-                break; 
-              case '无效':
-                style = {color:'#BBBBBB'}
-                break; 
-              default:
-                break;
-            }
-            return style
-            
-          }
-        },
       ]
       this.detailInfo = {
         baseInfo: [

+ 9 - 6
src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -18,11 +18,11 @@
           <el-form-item label="手机号" prop="phonenumber">
             <el-input v-model="form.phonenumber" placeholder="请输入手机号"></el-input>
           </el-form-item>
-          <el-form-item label="省市县" prop="value">
+          <el-form-item label="省市县" prop="province">
           <el-cascader
             style="width:100%"
             class="width-240"
-            v-model="form.value"
+            v-model="form.province"
             :options="basicData.data().areaData"
             @change="cascaderChange">
           </el-cascader>
@@ -69,7 +69,9 @@ export default {
       },
       rules:{
         phonenumber:[
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' },
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+
         ],
         province:[
           { required: true, message: '请选择', trigger: 'blur' },
@@ -86,6 +88,9 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         this.form.sat_campaignid = this.$route.query.id
+        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": 20221205162402,
           "content": this.form
@@ -98,9 +103,7 @@ export default {
       });
     },
     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]})
+      this.form.province = val
     }
   }
 }

+ 12 - 2
src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -14,8 +14,18 @@
     </div>
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="40vh" fixedName="operation">
       <template v-slot:customcol="scope">
-          <span v-if="scope.column.data[scope.column.columnname]">{{scope.column.data[scope.column.columnname]}}</span>
-          <span v-else-if="scope.column.columnname != 'operation'">--</span>
+          <span v-if="scope.column.columnname == 'province'">
+            {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
+          </span>
+          <div v-else-if="scope.column.columnname == 'status'">
+            <span style="color:#cccccc" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            <span style="color:#52C41A" v-else-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            <span style="color:#FA8C16" v-else-if="scope.column.data[[scope.column.columnname]] == '待跟进'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            <span style="color:#F60909" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            <span style="color:#BBBBBB" v-else-if="scope.column.data[[scope.column.columnname]] == '无效'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          </div>
+          <span v-else-if="scope.column.columnname != 'operation' && !scope.column.data[scope.column.columnname]">--</span>
+          <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
       </template>
       <template v-slot:opreation="scope">
         <slot name="editClue" :data="scope.data" />

+ 10 - 11
src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -18,11 +18,11 @@
           <el-form-item label="手机号" prop="phonenumber">
             <el-input v-model="form.phonenumber" placeholder="请输入手机号"></el-input>
           </el-form-item>
-          <el-form-item label="省市县" prop="value">
+          <el-form-item label="省市县" prop="province">
           <el-cascader
             style="width:100%"
             class="width-240"
-            v-model="form.value"
+            v-model="form.province"
             :options="basicData.data().areaData"
             @change="cascaderChange">
           </el-cascader>
@@ -68,7 +68,9 @@ export default {
       },
       rules:{
         phonenumber:[
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' },
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+
         ],
         province:[
           { required: true, message: '请选择', trigger: 'blur' },
@@ -81,13 +83,9 @@ export default {
   methods:{
     editBtn () {
       this.drawer = true
-      let arr = ['province','city','county']
-      this.data.value = []
-      arr.forEach(e=>{
-        this.data[e] !== '' ?this.data.value.push(this.data[e]):''
-      })
       this.form = Object.assign({},this.form,this.data)
       this.form.enterprisename = this.data.enterprisename_customer
+      this.form.province = [this.form.province,this.form.city,this.form.county]
       console.log(this.form);
       
     },
@@ -95,6 +93,9 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         this.form.sat_campaignid = this.$route.query.id
+        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": 20221205162402,
           "content": this.form
@@ -107,9 +108,7 @@ export default {
       });
     },
     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]})
+      this.form.province = val
     }
   }
 }

+ 3 - 2
src/HManagement/personalTarget/target/index.vue

@@ -22,8 +22,9 @@
       <template v-slot:tbList="scope">
         <div>
           <div v-if="scope.data.column.columnname === 'status'">
-            <span v-if="scope.data.column.data.status === '已下达'" style="color:#52C41A">{{scope.data.column.data.status}}</span>
-            <span v-else>{{scope.data.column.data.status}}</span>
+            <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已下达'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}

+ 19 - 1
src/HManagement/personalTarget/target/modules/edit/index.vue

@@ -106,6 +106,7 @@ export default {
       this.queryMainData(id)
     },
     changeDataStructure(){
+      let that = this
       this.mainAreaData = [
         {
           label:'年度',
@@ -121,7 +122,24 @@ export default {
         },
         {
           label:'状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '已下达':
+                style = {color:'#52c41a'}
+                break;
+              case '关闭':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         }
       ]
     },

+ 3 - 2
src/HManagement/projectTarget/target/index.vue

@@ -22,8 +22,9 @@
       <template v-slot:tbList="scope">
         <div>
           <div v-if="scope.data.column.columnname === 'status'">
-            <span v-if="scope.data.column.data.status === '已下达'" style="color:#52C41A">{{scope.data.column.data.status}}</span>
-            <span v-else>{{scope.data.column.data.status}}</span>
+            <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已下达'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}

+ 19 - 1
src/HManagement/projectTarget/target/modules/edit/index.vue

@@ -106,6 +106,7 @@ export default {
       this.queryMainData(id)
     },
     changeDataStructure(){
+      let that = this
       this.mainAreaData = [
         {
           label:'年度',
@@ -121,7 +122,24 @@ export default {
         },
         {
           label:'状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '已下达':
+                style = {color:'#52c41a'}
+                break;
+              case '关闭':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         }
       ]
     },

+ 3 - 1
src/HManagement/salesForecastTemplate/index.vue

@@ -21,7 +21,9 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span :style="scope.data.column.data[scope.data.column.columnname] == '发布' ? 'color: rgb(82, 196, 26)' : ''">{{scope.data.column.data[scope.data.column.columnname]}}</span>
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '发布'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '结束'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'isrepeat'">
           <span>{{scope.data.column.data.isrepeat == 1 ?'月度提报':'单次提报'}}</span>

+ 22 - 1
src/HManagement/salesForecastTemplate/modules/modelDetail.vue

@@ -68,12 +68,33 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
        {label:'提报要求',value:this.mainData.remarks},
         {label:'提报类型',value:this.mainData.isrepeat == 1 ?'月度提报':'单次提报'},
         {label:'预测金额',value:this.mainData.outamountsum},
         {label:'负责人',value:this.mainData.createby},
-        {label:'状态',value:this.mainData.status},
+        {
+          label:'状态',
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '发布':
+                style = {color:'#52c41a'}
+                break;
+              case '结束':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
+        },
       ]
     },
     // 监听切换数据,上一页,下一页

+ 22 - 0
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -139,6 +139,28 @@ export default {
           label:'手机号',
           value:this.mainData.contactsphonenumber
         },
+        {
+          label:'状态',
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '提交':
+                style = {color:'#52c41a'}
+                break;
+              case '审核':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
+        },
         /*{
           label:'邮箱',
           value:this.mainData.email

+ 5 - 0
src/SDrpManagement/QuotedPrice/index.vue

@@ -72,6 +72,11 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'status'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname === 'invaliddate'">
           <p>{{scope.data.column.data.begdate?scope.data.column.data.begdate+ '至' + scope.data.column.data.enddate:'--'}}</p>
         </div>

+ 39 - 2
src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -149,11 +149,48 @@ export default {
         },
         {
           label:'成交状态',
-          value:this.mainData.tradingstatus
+          value:this.mainData.tradingstatus,
+          style:function () {
+            let style = {}
+            switch (that.mainData.tradingstatus) {
+              case '已成交':
+                style = {color:'#fa8c16'}
+                break;
+              case '未成交':
+                style = {color:'#3874f6'}
+                break;
+              case '多次成交':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
         {
           label:'合作状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '潜在':
+                style = {color:'#3874f6'}
+                break;
+              case '合作中':
+                style = {color:'#52c41a'}
+                break;
+              case '已终止':
+                style = {color:'#999999'}
+                break;
+              default:
+                break;
+            }
+            return style
+            
+          }
+
         },
         {
           label:'负责人',

+ 10 - 0
src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -119,6 +119,16 @@
           <span v-if="scope.data.column.data['leader'].length !== 0">已分配</span>
           <span v-else>未分配</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'status'">
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{scope.data.column.data[[scope.data.column.columnname]]}}</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>
         </div>

+ 11 - 4
src/SManagement/orderclue/components/file/index2.vue

@@ -13,17 +13,23 @@
     >
       <div class="left">
         <div class="image">
-          <el-image :src="item.cover" fit="cover" alt  />
+          <previewImage 
+            v-if="item.fileType == 'image'"
+            style="width:38px;height:38px;margin:0px" 
+            :image="item" 
+            :deletebtn="false"
+          ></previewImage>
+          <el-image v-else :src="item.cover" fit="fit" alt  />
         </div>
         <div class="text">
           <!-- <el-tooltip v-if="item.document" class="item" effect="dark" :content="item.document" placement="top-start"> -->
             <p @click="downLoad(item)" style="font-size:14px" class="file-title">{{item.document}}</p>
           <!-- </el-tooltip> -->
-          <p class="create-date" style="font-size:12px">{{item.createdate}}</p>
+          <p class="create-date" style="font-size:12px" v-if="item.createdate">{{item.createdate}}</p>
         </div>
       </div>
       <div class="right">
-        <i class="el-icon-zoom-in" @click="seeClick(item)"></i>
+        <i class="el-icon-zoom-in" v-if="item.fileType != 'image'" @click="seeClick(item)"></i>
         <i class="el-icon-delete" style="font-size:16px" @click="deleteFile(item,index)" v-if="isDelete"></i>
       </div>
     </div>
@@ -33,9 +39,9 @@
 
 <script>
 import SeeFile from '@/components/file-block/components/SeeFile'
+import previewImage from '@/components/previewImage/index'
 
 import removeFile from '@/utils/removeFile'
-import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'index',
   data () {
@@ -72,6 +78,7 @@ export default {
   },
   components: {
     SeeFile,
+    previewImage
   },
   computed: {
   },

+ 5 - 5
src/SManagement/orderclue/index.vue

@@ -43,11 +43,11 @@
     </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#cccccc" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#FA8C16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#F60909" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#BBBBBB" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '无效'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待跟进'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已无效'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已转化'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'leader'">

+ 3 - 1
src/SManagement/sales_forecast/index.vue

@@ -15,7 +15,9 @@
       </div>
        <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span :style="scope.data.column.data[scope.data.column.columnname] == '发布' ? 'color: rgb(82, 196, 26)' : ''">{{scope.data.column.data[scope.data.column.columnname]}}</span>
+          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '待提报'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提报中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已提报'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'isrepeat'">
           <span>{{scope.data.column.data.isrepeat == 1 ?'月度提报':'单次提报'}}</span>

+ 22 - 1
src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -69,6 +69,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
         {label:'提报要求',value:this.mainData.remarks},
         {label:'提报类型',value:this.mainData.isrepeat == 1 ?'月度提报':'单次提报'},
@@ -76,7 +77,27 @@ export default {
         {label:'截止日期',value:this.mainData.periodend},
         {label:'预测金额',value:this.mainData.sumamount},
         {label:'负责人',value:this.mainData.createby},
-        {label:'状态',value:this.mainData.status},
+        {
+          label:'状态',
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '待提报':
+                style = {color:'#3874f6'}
+                break;
+              case '提报中':
+                style = {color:'#52c41a'}
+                break;
+              case '已提报':
+                style = {color:'#333333'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
+        },
       ]
     },
     // 监听切换数据,上一页,下一页