Merge branch 'orangeUrgent' into testToMerge

src/HDrpManagement/invoicePredictionManage/details/modules/order.vue

@@ -399,6 +399,17 @@
               </el-date-picker>
             </span>
           </div>
+          <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+            <div v-else>--</div>
+          </div>
           <p v-else>
             {{
               scope.column.data[scope.column.columnname]

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -35,7 +35,7 @@
             <div v-else-if="scope.column.columnname === 'rebate_discountrate'">
               {{Math.round((scope.column.data[scope.column.columnname] * 100)*100)/100 + '%'}}
             </div>
-            <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-else>{{scope.column.data[scope.column.columnname] || '--'}}</p>
           </template>
         </table-new-layout>
         <div class="container normal-panel" style="text-align:right;padding-bottom: 0">

src/HManagement/clueManage/clue_private/index.vue

@@ -140,6 +140,30 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <p class="search__label">{{ $t("来源") }}:</p>
+          <el-select
+              v-model="cluesource"
+              clearable
+              style="margin-right: 10px"
+              size="small"
+              :placeholder="$t('请选择来源')"
+              @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.cluesource = cluesource;
+              $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
+            "
+          >
+            <el-option
+                v-for="item in cluesourceList"
+                :label="$t(item.value)"
+                :key="item.rowindex"
+                :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -280,6 +304,8 @@ export default {
           isExport: 0,
         },
       },
+      cluesource:"",
+      cluesourceList:[]
     };
   },
   provide() {
@@ -295,6 +321,8 @@ export default {
     this.statusList = res2.data;
     const res3 = await this.$store.dispatch("optiontypeselect", "tradefield");
     this.tradefields = res3.data;
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesourcesift");
+    this.cluesourceList = res4.data;
     console.log(
       this.tool.tabelCol(this.$route.name).cluePrivateSalerTable.tablecols
     );

src/HManagement/clueManage/clue_public/index.vue

@@ -41,6 +41,30 @@
           </el-option>
         </el-select>
       </div>
+      <div class="mt-10">
+        <p class="search__label">{{ $t("来源") }}:</p>
+        <el-select
+            v-model="cluesource"
+            clearable
+            style="margin-right: 10px"
+            size="small"
+            :placeholder="$t('请选择来源')"
+            @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.cluesource = cluesource;
+              $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
+            "
+        >
+          <el-option
+              v-for="item in cluesourceList"
+              :label="$t(item.value)"
+              :key="item.rowindex"
+              :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
     </template>
       <div slot="titleRight" >
         <!-- <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution> -->
@@ -116,7 +140,9 @@ export default {
       selectList:[],
       tagData:[],
       tag:'',
-      tablecols:''
+      tablecols:'',
+      cluesource:"",
+      cluesourceList:[]
     }
   },
   provide() {
@@ -132,6 +158,8 @@ export default {
     this.statusList = res2.data
     const res3 = await this.$store.dispatch('optiontypeselect','tradefield')
     this.tradefields = res3.data
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesourcesift");
+    this.cluesourceList = res4.data;
     this.query_arealist()
     this.tagList()
     this.tablecols = this.tool.tabelCol(this.$route.name)['cluePublicTable'].tablecols

src/SDrpManagement/QuotedPrice/index.vue

@@ -162,6 +162,9 @@
         <div v-else-if="scope.data.column.columnname === 'distributor'">
           {{ issaler ? scope.data.column.data.enterprisename : "--" }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'quotedpriceamount'">
+          {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2,'¥')}}
+        </div>
         <div v-else>
           {{
             scope.data.column.data[[scope.data.column.columnname]]

src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -404,6 +404,17 @@
               </el-date-picker>
             </span>
           </div>
+          <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+            <div v-else>--</div>
+          </div>
           <p v-else>
             {{
               scope.column.data[scope.column.columnname]

src/SManagement/orderclue/index.vue

@@ -61,6 +61,30 @@
           </el-option>
         </el-select>
       </div>
+      <div class="mt-10">
+        <p class="search__label">{{ $t("来源") }}:</p>
+        <el-select
+            v-model="cluesource"
+            clearable
+            style="margin-right: 10px"
+            size="small"
+            :placeholder="$t('请选择来源')"
+            @change="
+              $refs.list.param.content.pageNumber = 1;
+              $refs.list.param.content.where.cluesource = cluesource;
+              $refs.list.listData();
+              param = $refs.list.param
+            "
+        >
+          <el-option
+              v-for="item in cluesourceList"
+              :label="$t(item.value)"
+              :key="item.rowindex"
+              :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
     </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -137,7 +161,9 @@ export default {
       tagData:[],
       tag:'',
       param:{},
-      tablecols:[]
+      tablecols:[],
+      cluesource:"",
+      cluesourceList:[]
     }
   },
   provide() {
@@ -159,6 +185,8 @@ export default {
     this.statusList = res2.data
     const res3 = await this.$store.dispatch('optiontypeselect','tradefield')
     this.tradefields = res3.data
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesourcesift");
+    this.cluesourceList = res4.data;
     console.log(this.statusList);
     this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols
   },

src/template/prediction/addTemp.vue

@@ -61,6 +61,17 @@
                 <div v-else-if="scope.column.columnname === 'marketprice'">
                   <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
                 </div>
+                <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+                  <div v-else>--</div>
+                </div>
                 <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
               </template>
               <template v-slot:opreation="scope">

src/template/prediction/addTemp1.vue

@@ -61,6 +61,17 @@
                 <div v-else-if="scope.column.columnname === 'marketprice'">
                   <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
                 </div>
+                <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+                  <div v-else>--</div>
+                </div>
                 <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
               </template>
               <template v-slot:opreation="scope">