Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -29,6 +29,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -31,6 +31,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -36,6 +36,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -33,6 +33,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -32,6 +32,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -30,6 +30,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -32,6 +32,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -73,6 +73,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -34,6 +34,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -34,6 +34,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel.vue

@@ -29,6 +29,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel1.vue

@@ -31,6 +31,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel2.vue

@@ -36,6 +36,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel3.vue

@@ -33,6 +33,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel4.vue

@@ -32,6 +32,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -32,6 +32,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -29,6 +29,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -37,6 +37,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -31,6 +31,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -32,6 +32,7 @@
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>

src/views/Task/daikeComponents/KtOrder.vue

@@ -408,11 +408,12 @@
       </div>
       <div style="height: 300px; overflow-y: auto">
         <el-steps direction="vertical" :active="trajectoryTable.length - 1">
-          <el-step :title="item.orderStatus | cap" :key="item.id" v-for="item in trajectoryTable">
+          <el-step :title="item.orderStatus | caps" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
               <span>保险公司：{{ item.insCompany }}</span>
               <span>提交人：{{ item.operator }}</span>
               <div>创建时间：{{ item.createTime }}</div>
+              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
             </template>
           </el-step>
         </el-steps>
@@ -815,6 +816,7 @@ export default {
       logoImg: "", //报价单保险公司logo图
       value2: "",
       optionsStatus: [],
+      optionsStatusAll: [],
       codedialogVisible: false,
       codedialogVisiblePro: false,
       loading: false,
@@ -965,7 +967,8 @@ export default {
     });
 
     this.$api.insCompany.dicType("insOrderStatus").then((res) => {
-      this.optionsStatus = res.data.ddList;
+      this.optionsStatusAll = res.data.ddList;
+      this.optionsStatus = res.data.ddList.filter(item => item.dictValue !="状态更新");
     });
     this.peopleid = Cookies.get("user");
     this.$api.dept.findDeptTree().then((res) => {
@@ -1011,6 +1014,11 @@ export default {
         return item.dictValue === ele;
       }).dictTag;
     },
+    caps(ele) {
+      return _self.optionsStatusAll.find((item) => {
+        return item.dictValue === ele;
+      }).dictTag;
+    },
   },
   unmounted() {
     window.removeEventListener("resize", this.getDimensions);