代码上传

src/HDrpManagement/projectTask/detail/modules/evaluationItems.vue

@@ -2,13 +2,29 @@
   <div>
   <!--  评估项  -->
     <div>
-      <tableLayout ref="table" :layout="tablecolsItem" :data="listItem" :opwidth="200" :custom="true" @rowClick="rowClick">
-        <template v-slot:customcol="scope">
-          <p>{{scope.column.data[scope.column.columnname]}}</p>
-        </template>
-        <template v-slot:opreation="scope">
-        </template>
-      </tableLayout>
+      <el-table
+          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+          style="width: 100%"
+          size="mini"
+          border
+          highlight-current-row
+          ref="listItem" :data="listItem" :opwidth="200" :custom="true" @row-click="rowClick"
+          >
+        <el-table-column
+            prop="optionname"
+            label="评估项"
+            >
+        </el-table-column>
+        <el-table-column
+            prop="remarks"
+            label="描述"
+            >
+        </el-table-column>
+        <el-table-column
+            prop="score"
+            label="独立项分值">
+        </el-table-column>
+      </el-table>
     </div>
   <!-- 关联对象  -->
     <div style="margin-top: 20px" v-if="flag">
@@ -87,29 +103,37 @@ export default {
         console.log("有阶段")
         this.flagStage = true
       }
-      if (this.data.onstage === 0 || this.data.onparties === 0){
+      if (this.data.onstage === 0 && this.data.onparties === 0){
         this.flag = false
       }else {
         this.flag = true
         this.listObject = row.projtaskmag_optionscore
       }
     },
+    setDefault () {
+      this.listItem = this.data.projtaskmag_options
+      if (this.data.onstage === 0 && this.data.onparties === 0){
+        this.listObject = []
+      } else {
+        this.listObject = this.data.projtaskmag_options[0].projtaskmag_optionscore
+        this.rowClick(this.data.projtaskmag_options[0])
+      }
+      this.$nextTick(()=>{
+        this.$refs['listItem'].setCurrentRow(this.listItem[0])
+      })
+    }
   },
-  created() {
-    this.tablecolsItem = this.tool.tabelCol(this.$route.name).evaluationItems.tablecols
-    this.listItem = this.data.projtaskmag_options
-    this.listObject = []
+  watch: {
+    data (val) {
+      this.setDefault()
+    }
   },
+  mounted () {
+    this.setDefault()
+  }
 }
 </script>
 <style>
- .el-table .warning-row {
-    background: oldlace;
-  }
-
-  .el-table .success-row {
-    background: #f0f9eb;
-  }
 </style>
 <style scoped>
 

src/HDrpManagement/projectTask/index.vue

@@ -23,8 +23,11 @@
           </div>
           <div v-else>
             <span v-for="item in scope.data.column.data.partiestype" :key="item.index">
-            {{item?item + ',':'--'}}
-          </span>
+              <span v-if="item">
+                <el-tag type="warning" style="margin-right: 7px;margin-bottom: 7px">{{item}}</el-tag>
+              </span>
+              <span v-else>--</span>
+            </span>
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'stage'">
@@ -33,7 +36,10 @@
           </div>
           <div v-else>
             <span v-for="item in scope.data.column.data.stage" :key="item.index">
-            {{item?item + ',':'--'}}
+              <span v-if="item">
+                <el-tag style="margin-right: 7px;margin-bottom: 7px">{{item}}</el-tag>
+              </span>
+              <span v-else>--</span>
           </span>
           </div>
 

src/HManagement/clueManage/clue_import/index.vue

@@ -2,10 +2,7 @@
 <template>
   <div>
     <basicLayout 
-      ref="basicLayout" 
-      :oldFormPath="{
-        edit:'HManagement/clueManage/clue_public/modules'
-      }"
+      ref="basicLayout"
       tableName="clueImportList" 
       idName="sat_orderclueuploadbillid" 
       :apiId="{query:20221101094702,del:20221101100702}" 

src/HManagement/clueManage/clue_private/index.vue

@@ -58,6 +58,11 @@
           <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 == 'leadername'">
+          <span>
+            {{scope.data.column.data.allocationstatus === '已分配'?scope.data.column.data.leader[0].name:'--'}}
+          </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>
@@ -66,9 +71,9 @@
           <span v-if="scope.data.column.data.province.length > 0">{{scope.data.column.data.province}}-{{scope.data.column.data.city}}-{{scope.data.column.data.county}}</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>
-        <span v-if="!scope.data.column.data[scope.data.column.columnname] ">--</span>
+<!--        <span v-if="!scope.data.column.data[scope.data.column.columnname] ">&#45;&#45;</span>-->
       </template>
     </basicLayout>
   </div>

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -133,7 +133,7 @@ export default {
         },
         {
           label:'负责人',
-          value:this.mainData.leadername
+          value:this.mainData.allocationstatus === '已分配'?this.mainData.leader[0].name:'--'
         },
         {
           label:'所属经销商',
@@ -211,7 +211,7 @@ export default {
           },
           {
             label:'负责人',
-            value:this.mainData.leadername
+            value:this.mainData.allocationstatus === '已分配'?this.mainData.leader[0].name:'--'
           },
           {
             label:'备注',

src/SManagement/orderclue_detail/index.vue

@@ -191,6 +191,10 @@ export default {
             label:'来源',
             value:this.mainData.cluesource
           },
+          {
+            label:'负责人',
+            value:this.mainData.leader.length > 0 && this.mainData.leader[0].name
+          },
           // {
           //   label:'负责人',
           //   value:this.mainData.leader[0].name