Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/personal/pendingList.vue

@@ -59,7 +59,7 @@
         </el-table-column>
         <el-table-column label="中介" align="center" width="130" v-if="!hiddenLabels.includes('agent')" prop="agent">
           <template slot-scope="{row}">
-            <span>{{ row.agent?ow.agent:'-' }}</span>
+            <span>{{ row.agent?row.agent:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="联系人" align="center" width="130" v-if="!hiddenLabels.includes('contactName')" prop="contactName">

src/views/personal/todoDetail.vue

@@ -551,7 +551,7 @@
                   <el-input-number v-model="scope.row.compareA.valueA" style="width:100%;" :min="0" size="small"
                     controls-position="right"></el-input-number>
                 </div>
-                <div v-else-if="scope.row.index === '室内装饰'">
+                <!-- <div v-else-if="scope.row.index === '室内装饰'">
                   <el-select v-model="scope.row.compareA.valueA" placeholder="请选择" style="width:60%">
                     <el-option label="精装" value="精装">精装</el-option>
                     <el-option label="中等装修" value="中等装修">中等装修</el-option>
@@ -560,7 +560,7 @@
                   </el-select>
                   <el-input-number v-model="scope.row.compareA.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
-                </div>
+                </div> -->
                 <div v-else>
                   <el-input style="width:100%" v-model="scope.row.compareA.valueA" />
                 </div>
@@ -605,7 +605,7 @@
                   <el-input-number v-model="scope.row.compareB.valueA" style="width:100%;" :min="0" size="small"
                     controls-position="right"></el-input-number>
                 </div>
-                <div v-else-if="scope.row.index === '室内装饰'">
+                <!-- <div v-else-if="scope.row.index === '室内装饰'">
                   <el-select v-model="scope.row.compareB.valueA" placeholder="请选择" style="width:60%">
                     <el-option label="精装" value="精装">精装</el-option>
                     <el-option label="中等装修" value="中等装修">中等装修</el-option>
@@ -614,7 +614,7 @@
                   </el-select>
                   <el-input-number v-model="scope.row.compareB.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
-                </div>
+                </div> -->
                 <div v-else>
                   <el-input style="width:100%" v-model="scope.row.compareB.valueA" />
                 </div>
@@ -659,7 +659,7 @@
                   <el-input-number v-model="scope.row.compareC.valueA" style="width:100%;" :min="0" size="small"
                     controls-position="right"></el-input-number>
                 </div>
-                <div v-else-if="scope.row.index === '室内装饰'">
+                <!-- <div v-else-if="scope.row.index === '室内装饰'">
                   <el-select v-model="scope.row.compareC.valueA" placeholder="请选择" style="width:60%">
                     <el-option label="精装" value="精装">精装</el-option>
                     <el-option label="中等装修" value="中等装修">中等装修</el-option>
@@ -668,7 +668,7 @@
                   </el-select>
                   <el-input-number v-model="scope.row.compareC.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
-                </div>
+                </div> -->
                 <div v-else>
                   <el-input style="width:100%" v-model="scope.row.compareC.valueA" />
                 </div>
@@ -1419,10 +1419,10 @@ export default {
           {
             "sorted": null,
             "index": "室内装饰",
-            "compareA": { valueA: '精装', weight: 100 },
-            "compareB": { valueA: '精装', weight: 100 },
-            "compareC": { valueA: '精装', weight: 100 },
-            "target": { valueA: '精装', weight: 100 },
+            "compareA": { valueA: null, weight: 100 },
+            "compareB": { valueA: null, weight: 100 },
+            "compareC": { valueA: null, weight: 100 },
+            "target": { valueA: null, weight: 100 },
           },
           {
             "sorted": null,
@@ -1610,6 +1610,7 @@ export default {
             if (res.data.feedback) {
               this.feedback = JSON.parse(res.data.feedback);
               this.nodeBusinessInfo.production = this.feedback;
+              this.nodeBusinessInfo.ifFeedback = this.feedback?false:true;
             } else {
               this.feedback = []
             }
@@ -1996,6 +1997,7 @@ export default {
       this.nodeBusinessInfo.ifFeedback = true;
       if (this.target.id && this.target.feedback && this.target.feedback != 'NONE') {
         this.nodeBusinessInfo.ifFeedback = false;
+        this.nodeBusinessInfo.production = [this.target.feedback];
         const feedbackReq = new Object();
         feedbackReq.feedback = this.target.feedback;
         feedbackReq.id = this.target.id;