Merge branch 'allTestUrgent' into redUrgent

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-yos
+yos
+package-lock.json

.idea/stylesheetLinters/stylelint.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="StylelintConfiguration" allowJS="true" />
+</project>

public/index.html

@@ -20,4 +20,23 @@
     <meta http-equiv="pragma" content="no-cache">
   </head>
 </html>
- 
+<script>
+    window.difyChatbotConfig = {
+        token: '7V3kIkvQJfvJQFQp',
+        baseUrl: 'http://192.168.3.12'
+    }
+</script>
+<script
+        src="http://192.168.3.12/embed.min.js"
+        id="7V3kIkvQJfvJQFQp"
+        defer>
+</script>
+<style>
+    #dify-chatbot-bubble-button {
+        background-color: #1C64F2 !important;
+    }
+    #dify-chatbot-bubble-window {
+        width: 24rem !important;
+        height: 40rem !important;
+    }
+</style>

src/Form/marketing2/agent/edit.vue

@@ -10,7 +10,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t(`企业名称`)+':'" prop="enterprisename">
-              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>
+<!--              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>-->
+              <el-input v-model="enterprise.enterprisename" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -262,7 +263,8 @@ export default {
       timer:0,
       radio:-1,
       title:'选择上级合作伙伴',
-      value:''
+      value:'',
+      loading:false
     }
   },
   components:{
@@ -441,6 +443,9 @@ export default {
 
       return _isSame
     },
+    onClose(){
+      this.dialogVisible = false
+    }
 
   },
 

src/HDrpManagement/collectionRule/components/edit.vue

@@ -206,7 +206,7 @@ export default {
       }
     },
     isUsedChange(value){
-      if (value === '订单'){
+      if (value === '审核'){
         if (this.auditIsUsed !== 1){
           this.$refs.audit.list = [{
             days:'',

src/HDrpManagement/collectionRule/components/setInfo.vue

@@ -5,7 +5,7 @@
       <el-input type="number" style="width: 100px" v-model="item.days" :placeholder="$t(`请输入`)"></el-input>
       <span style="margin-left: 5px">{{$t(`天`)}}</span>
       <span style="margin-left: 20px">{{$t(`立账额度`)}}：</span>
-      <el-input type="number" style="width: 100px" v-model="item.amountrate" :placeholder="$t(`请输入`)" :class="{ 'is-error': isErrorInvoiceapply }"  @change="checkAmountrate"></el-input>
+<!--      <el-input type="number" style="width: 100px" v-model="item.amountrate" :placeholder="$t(`请输入`)" :class="{ 'is-error': isErrorInvoiceapply }"  @change="checkAmountrate"></el-input>-->
       <span style="margin-left: 5px">%</span>
       <el-checkbox style="margin-left: 20px" v-model="item.iswarranty" true-label="1" false-label="0" >{{$t(`质保金`)}}</el-checkbox>
       <el-button v-if="index === list.length -1" type="text" icon="el-icon-plus" style="margin-left: 10px" @click="addList"></el-button>

src/HDrpManagement/collectionRule/index.vue

@@ -89,9 +89,15 @@ export default {
       this.currentPage = res.pageNumber
       this.list.forEach(item=>{
         if (item.accountingnodes){
-          item.accountingnodes.ordercheck.amountrate = Math.round((item.accountingnodes.ordercheck.amountrate * 100)*100)/100
-          item.accountingnodes.logisticscheck.amountrate = Math.round((item.accountingnodes.logisticscheck.amountrate * 100)*100)/100
-          item.accountingnodes.invoiceapplycheck.amountrate = Math.round((item.accountingnodes.invoiceapplycheck.amountrate * 100)*100)/100
+          if (item.accountingnodes.ordercheck && item.accountingnodes.ordercheck.length > 0){
+            item.accountingnodes.ordercheck.amountrate = Math.round((item.accountingnodes.ordercheck.amountrate * 100)*100)/100
+          }
+          if (item.accountingnodes.logisticscheck && item.accountingnodes.logisticscheck.length > 0){
+            item.accountingnodes.logisticscheck.amountrate = Math.round((item.accountingnodes.logisticscheck.amountrate * 100)*100)/100
+          }
+          if (item.accountingnodes.invoiceapplycheck && item.accountingnodes.invoiceapplycheck.length>0){
+            item.accountingnodes.invoiceapplycheck.amountrate = Math.round((item.accountingnodes.invoiceapplycheck.amountrate * 100)*100)/100
+          }
         }
       })
       console.log(this.list,'list')

src/HDrpManagement/contactProfile/modules/detail.vue

@@ -50,54 +50,54 @@
               <el-descriptions-item :label="$t(`联系方式`)"
                 ><span
                   style="color: #e85b5b; font-size: 16px; font-weight: bold"
-                  >{{ detailInfo.phonenumber }}</span
+                  >{{ detailInfo.phonenumber?detailInfo.phonenumber:'--' }}</span
                 >
               </el-descriptions-item>
               <el-descriptions-item :label="$t('微信')">{{
-                detailInfo.wechatnum
+                detailInfo.wechatnum || '--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`偏好`)">{{
-                detailInfo.preference
+                detailInfo.preference || '--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`分级`)"
                 ><span
                   style="color: #e85b5b; font-size: 16px; font-weight: bold"
                 >
-                  {{ detailInfo.grade }}</span
+                  {{ detailInfo.grade || '--' }}</span
                 >
               </el-descriptions-item>
               <el-descriptions-item :label="$t(`邮箱`)">{{
-                detailInfo.email
+                detailInfo.email || '--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`爱好`)">{{
-                detailInfo.hobby
+                detailInfo.hobby || '--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`性别`)">
-                {{ detailInfo.sex }}</el-descriptions-item
+                {{ detailInfo.sex || '--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`传真`)">{{
-                detailInfo.fax
+                detailInfo.fax || '--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('备注')">
-                {{ detailInfo.remarks }}</el-descriptions-item
+                {{ detailInfo.remarks || '--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`生日`)">
-                {{ detailInfo.birthday }}</el-descriptions-item
+                {{ detailInfo.birthday || '--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`家庭住址`)">
-                {{ detailInfo.homeaddress }}</el-descriptions-item
+                {{ detailInfo.homeaddress || '--'}}</el-descriptions-item
               >
               <el-descriptions-item :label="$t('负责人')"
               ><span
                   style="color: #e85b5b; font-size: 16px; font-weight: bold"
-              >{{ detailInfo.leadername }}</span
+              >{{ detailInfo.leadername || '--' }}</span
               >
               </el-descriptions-item>
               <el-descriptions-item :label="$t('部门')">
-                {{ detailInfo.depname }}</el-descriptions-item
+                {{ detailInfo.depname  || '--'}}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`群组`)">{{
-                  detailInfo.groupname
+                  detailInfo.groupname || '--'
                 }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`未跟进天数`)"
                 ><span
@@ -123,7 +123,7 @@
                 </el-tooltip>
               </el-descriptions-item>
               <el-descriptions-item :label="$t('职位')">
-                {{ detailInfo.position }}</el-descriptions-item
+                {{ detailInfo.position  || '--'}}</el-descriptions-item
               >
             </el-descriptions>
           </div>
@@ -324,45 +324,13 @@
                   </div>
                   <div v-else-if="scope.data.columnname === 'tradingstatus'">
                     <span
-                      v-if="
-                        scope.data.data[[scope.data.columnname]] == '未成交'
-                      "
-                      style="color: #3874f6"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '已成交'
-                      "
-                      style="color: #fa8c16"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '多次成交'
-                      "
-                      style="color: #333333"
+                      :style="tool.getStatusColor(scope.data.data[[scope.data.columnname]])"
                       >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
                     >
                   </div>
                   <div v-else-if="scope.data.columnname === 'status'">
                     <span
-                      v-if="scope.data.data[[scope.data.columnname]] == '潜在'"
-                      style="color: #3874f6"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '合作中'
-                      "
-                      style="color: #52c41a"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '已终止'
-                      "
-                      style="color: #999999"
+                        :style="tool.getStatusColor(scope.data.data[[scope.data.columnname]])"
                       >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
                     >
                   </div>
@@ -456,31 +424,7 @@
                   </div>
                   <div v-else-if="scope.data.columnname === 'status'">
                     <span
-                      v-if="
-                        scope.data.data[[scope.data.columnname]] == '跟进中'
-                      "
-                      style="color: #52c41a"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '已成交'
-                      "
-                      style="color: #fa8c16"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '已失败'
-                      "
-                      style="color: #999999"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '已结案'
-                      "
-                      style="color: #999999"
+                      :style="tool.getStatusColor(scope.data.data[[scope.data.columnname]])"
                       >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
                     >
                   </div>
@@ -572,7 +516,7 @@
                 "
               >
                 <template v-slot:custom="scope">
-                  <div v-if="scope.data.columnname === 'sumamount'">
+                  <div v-if="scope.data.columnname === 'quotedpriceamount'">
                     {{
                       $t(scope.data.data[scope.data.columnname])
                         ? "¥" +
@@ -594,7 +538,7 @@
                         : "--"
                     }}
                   </div>
-                  <div v-else-if="scope.data.columnname === 'specialoffer'">
+                  <div v-else-if="scope.data.columnname === 'specialoffer'" :style="{color:scope.data.data[scope.data.columnname] == '1'?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">
                     {{
                       $t(scope.data.data[scope.data.columnname]) == "1"
                         ? $t("是")
@@ -612,29 +556,7 @@
                   </div>
                   <div v-else-if="scope.data.columnname === 'status'">
                     <span
-                      v-if="scope.data.data[[scope.data.columnname]] == '新建'"
-                      style="color: #3874f6"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '提交'
-                      "
-                      style="color: #52c41a"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '审核'
-                      "
-                      style="color: #333333"
-                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '复核'
-                      "
-                      style="color: #fa8c16"
+                      :style="tool.getStatusColor(scope.data.data[[scope.data.columnname]])"
                       >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
                     >
                   </div>
@@ -780,8 +702,8 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
@@ -793,8 +715,8 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
@@ -806,8 +728,8 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
@@ -819,8 +741,8 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
@@ -832,8 +754,8 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'returnamount'">
@@ -845,48 +767,14 @@
                             "￥"
                           )
                         : scope.data.data[scope.data.columnname] == 0
-                        ? "￥ 0.00"
-                        : "--"
+                        ? "￥0.00"
+                        : "￥0.00"
                     }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'status'">
                     <span
-                      v-if="scope.data.data[[scope.data.columnname]] == '新建'"
-                      style="color: #000000"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '提交'
-                      "
-                      style="color: #d90a0a"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
-                    >
-                    <span
-                      v-if="
-                        scope.data.data[[scope.data.columnname]] == '交期待确认'
-                      "
-                      style="color: #e09a1a"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '交期确认'
-                      "
-                      style="color: #3874f6"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
-                    >
-                    <span
-                      v-if="scope.data.data[[scope.data.columnname]] == '审核'"
-                      style="color: #52c41a"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
-                    >
-                    <span
-                      v-else-if="
-                        scope.data.data[[scope.data.columnname]] == '关闭'
-                      "
-                      style="color: #b2c0ea"
-                      >{{ scope.data.data[[scope.data.columnname]] }}</span
+                      :style="tool.getStatusColor(scope.data.data[[scope.data.columnname]])"
+                      >{{ $t(scope.data.data[[scope.data.columnname]]) }}</span
                     >
                   </div>
                   <div

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -20,12 +20,12 @@
           </div>
           <div class="Mcontainer-header__right">
             <el-descriptions class="margin-top">
-              <el-descriptions-item :label="$t('客户类型')">{{ $t(baseInfo.type) }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`客户等级`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.grade) }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t(`合作状态`)"><span style="color:#3874f6">{{ $t(baseInfo.status) }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t(`客户行业`)">{{ baseInfo.industry.join(',') }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`客户分类`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.customergrade) }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t('成交状态')"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradingstatus) }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('客户类型')">{{ $t(baseInfo.type?baseInfo.type:'--') }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`客户等级`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.grade?baseInfo.grade:'--') }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t(`合作状态`)"><span style="color:#3874f6">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t(`客户行业`)">{{ baseInfo.industry && baseInfo.industry.length>0?baseInfo.industry.join(','):'--'}}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`客户分类`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.customergrade?baseInfo.customergrade:'--') }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('成交状态')"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradingstatus?baseInfo.tradingstatus:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`未跟进天数`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold;margin-right: 10px">{{ baseInfo.subdate ? baseInfo.subdate  + $t('天') : baseInfo.subdate }}</span>
                 <el-tooltip class="item" effect="dark" :content="$t(`未跟进天数=当前查询时间-最近跟进时间-节假日`)" placement="top">
                   <i class="el-icon-warning-outline"></i>
@@ -39,24 +39,24 @@
         <div class="MaccountInfo">
           <showIsNone :title="$t(`工商信息`)">
             <el-descriptions :column="2" border>
-              <el-descriptions-item :label="$t(`法定代表人`)" label-class-name="my-label">{{ baseInfo2.legalPerson }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`注册资本`)">{{ baseInfo2.regCapital }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`统一社会信用代码`)">{{ baseInfo2.taxNum }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`法定代表人`)" label-class-name="my-label">{{ baseInfo2.legalPerson?baseInfo2.legalPerson:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`注册资本`)">{{ baseInfo2.regCapital?baseInfo2.regCapital:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`统一社会信用代码`)">{{ baseInfo2.taxNum?baseInfo2.taxNum:'--' }}</el-descriptions-item>
 
-              <el-descriptions-item :label="$t(`工商注册号`)">{{ baseInfo2.regNumber }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`纳税人识别号`)">{{ baseInfo2.taxNum }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`行业大类`)">{{ $t(baseInfo2.industry) }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`人员规模`)">{{ baseInfo2.staffNumRange }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`经营期限至`)">{{ baseInfo2.toTime }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`工商注册号`)">{{ baseInfo2.regNumber?baseInfo2.regNumber:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`纳税人识别号`)">{{ baseInfo2.taxNum?baseInfo2.taxNum:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`行业大类`)">{{ $t(baseInfo2.industry?baseInfo2.industry:'--') }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`人员规模`)">{{ baseInfo2.staffNumRange?baseInfo2.staffNumRange:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`经营期限至`)">{{ baseInfo2.toTime?baseInfo2.toTime:'--' }}</el-descriptions-item>
 
               <el-descriptions-item :label="$t(`注册地址`)">
                 <div style="max-width:500px">
-                    <p>{{ baseInfo2.address }}</p>
+                    <p>{{ baseInfo2.address?baseInfo2.address:'--' }}</p>
                 </div>
               </el-descriptions-item>
               <el-descriptions-item :label="$t(`经营范围`)">
                 <div style="max-width:500px">
-                    <p>{{ $t(baseInfo2.businessScope) }}</p>
+                    <p>{{ $t(baseInfo2.businessScope?baseInfo2.businessScope:'--') }}</p>
                 </div>
               </el-descriptions-item>
             </el-descriptions>
@@ -155,13 +155,16 @@
                   <el-tag size="small" v-for="(item,index) in scope.data.data.stagecount" :key="index">{{ $t(item.stagename) }}</el-tag>
                 </div>
                 <div v-else-if="scope.data.columnname == 'signamount_due'">
-                  {{scope.data.data.signamount_due && tool.formatAmount(scope.data.data.signamount_due || 0,2,'￥')  }}
+                  {{scope.data.data.signamount_due ? tool.formatAmount(scope.data.data.signamount_due,2,'￥'):'￥0.00'  }}
                 </div>
                 <div v-else-if="scope.data.columnname == 'scale'">
-                  {{scope.data.data.scale ? $t(scope.data.data.scale) + $t(scope.data.data.unitname) : '' }}
+                  {{scope.data.data.scale ? $t(scope.data.data.scale) + $t(scope.data.data.unitname) : '--' }}
+                </div>
+                <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
                 </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -194,14 +197,14 @@
               :custom="true"
             >
             <template v-slot:custom="scope">
-              <div v-if="scope.data.columnname == 'specialoffer'">
+              <div v-if="scope.data.columnname == 'specialoffer'" :style="{color:scope.data.data.specialoffer?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">
                 {{ scope.data.data.specialoffer ? $t('是') : $t('否') }}
               </div>
-              <div v-else-if="scope.data.columnname == 'sumamount'">
-                {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
+              <div v-else-if="scope.data.columnname == 'quotedpriceamount'">
+                {{scope.data.data.quotedpriceamount ? tool.formatAmount(scope.data.data.quotedpriceamount,2,'￥') : '￥0.00' }}
               </div>
               <div v-else-if="scope.data.columnname == 'begdate'">
-                {{scope.data.data.begdate }}-{{scope.data.data.enddate }}
+                {{tool.getDataChange(scope.data.data.begdate) + $t(`至`) + tool.getDataChange(scope.data.data.enddate)}}
               </div>
               <div v-else>
                 {{ $t(scope.data.data[scope.data.columnname]) }}
@@ -246,13 +249,20 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'signAmount'">
-                  {{scope.data.data.signAmount && tool.formatAmount(scope.data.data.signAmount || 0,2,'￥')  }}
+                  {{scope.data.data.signAmount ? tool.formatAmount(scope.data.data.signAmount,2,'￥'):'￥0.00'  }}
                 </div>
                 <div v-else-if="scope.data.columnname == 'enddate'">
                   {{scope.data.data.begdate + $t('至') + scope.data.data.enddate }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'type'">
+                  {{scope.data.data[scope.data.columnname] == '框架' ? '经销商合作协议':scope.data.data[scope.data.columnname] == '项目'?'项目协议'
+                    :scope.data.data[scope.data.columnname] == '居间'?'居间协议':scope.data.data[scope.data.columnname] == '工具借用'?'工具借用协议':'直销客户合作协议'}}
+                </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -293,25 +303,28 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'sumamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'returnamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
                 </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -341,7 +354,17 @@
               ref="fuwu"
               :tablecols="tool.tabelCol($route.name).serveOrderTable.tablecols"
               :param="param6"
-            ></pageTable>
+              :custom="true"
+            >
+              <template v-slot:custom="scope">
+                <div v-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
+                </div>
+                <div v-else>
+                  {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
+                </div>
+              </template>
+            </pageTable>
             </showIsNone>
           </el-card>
         </div>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -8,6 +8,7 @@
     :mainAreaData="mainAreaData"
     :turnPageId="20221020143502"
     idname="sa_projectid"
+    ownertable="sa_project"
     typeTask="项目商机"
     :tags="[]"
     :tabs="tool.checkAuth($route.name,'productSetQuery')?['报价单','合同','详细信息','关联客户','联系人','产品配置单','关联线索','报备进度','竞争对手','项目评估']:['报价单','合同','详细信息','关联客户','联系人','关联线索','报备进度','竞争对手','项目评估']"

src/HDrpManagement/projectData/index.vue

@@ -1576,6 +1576,9 @@
                           <span style="color:#52c41a" v-else-if="scope.data.data[[scope.data.columnname]] == '跟进中'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                           <span style="color:#999999" v-else-if="scope.data.data[[scope.data.columnname]] == '已失败' || scope.data.data[[scope.data.columnname]] == '已结案'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                         </div>
+                        <div v-else-if="scope.data.columnname == 'scale'">
+                          {{scope.data.data.scale ? scope.data.data.scale + scope.data.data.unitname : '' }}
+                        </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
                                       :listqueryid="detailDataSet.unfllowTable.listqueryid" :total="detailDataSet.unfllowTable.total" :overview="false"></drawerTemp>
@@ -2952,7 +2955,7 @@ export default {
           interactions: [{ type: 'element-selected' },{ type: 'element-active' }],
         });
         this.projectFllowMap.on('element:click',(v) => {
-          if (v.data.data.value != this.fllowTableParam.content.where.isfollowup) {
+          if (v.data.data.key != this.fllowTableParam.content.where.isfollowup) {
             this.fllowTableParam.content.where.isfollowup = v.data.data.key
             this.fllowTableParam.content.pageNumber = 1
             this.$refs.projectFllowTable.listData()

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -20,23 +20,23 @@
           </div>
           <div class="Mcontainer-header__right">
             <el-descriptions class="margin-top">
-              <el-descriptions-item :label="$t('项目编号')">{{ baseInfo.projectnum }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('项目类型')">{{ baseInfo.projecttype }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`领域`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradefield) }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('项目编号')">{{ baseInfo.projectnum?baseInfo.projectnum:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('项目类型')">{{ baseInfo.projecttype?baseInfo.projecttype:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`领域`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradefield?baseInfo.tradefield:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`预计签约金额(元)`)"> {{ tool.formatAmount(baseInfo.signamount_due || 0,2,'￥') }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('项目状态')"><span style="color:#3874f6">{{ $t(baseInfo.status) }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('项目状态')"><span style="color:#3874f6">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`未跟进天数`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold;margin-right: 10px">{{ baseInfo.subdate ? baseInfo.subdate  + $t('天') : baseInfo.subdate }}</span>
                 <el-tooltip class="item" effect="dark" :content="$t(`未跟进天数=当前查询时间-最近跟进时间-节假日`)" placement="top">
                   <i class="el-icon-warning-outline"></i>
                 </el-tooltip>
               </el-descriptions-item>
               <el-descriptions-item :label="$t(`项目等级`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold"> {{ $t(baseInfo.grade) }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t('品牌')"> {{ $t(baseInfo.brandname) }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('品牌')"> {{ $t(baseInfo.brandname?baseInfo.brandname:'--') }}</el-descriptions-item>
               <el-descriptions-item :label="$t('项目规模')"> {{ baseInfo.scale ? $t(baseInfo.scale) + $t(baseInfo.unitname) : '' }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`预计开工时间`)"> {{ baseInfo.begdate_due }}</el-descriptions-item>
-              <el-descriptions-item :label="$t(`预计签约时间`)"> {{ baseInfo.signdate_due }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`预计开工时间`)"> {{ baseInfo.begdate_due?baseInfo.begdate_due:'--' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t(`预计签约时间`)"> {{ baseInfo.signdate_due?baseInfo.signdate_due:'--' }}</el-descriptions-item>
               <el-descriptions-item :label="$t('负责人')"> <span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.team.length && baseInfo.team.filter(item =>item.isleader == 1)[0].name }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t('项目阶段')"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.stagename) }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('项目阶段')"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.stagename?baseInfo.stagename:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`项目评估总分`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.allsumscore }}</span> </el-descriptions-item>
               <el-descriptions-item :label="$t('项目地址')">
                 <div style="max-width:500px">
@@ -83,7 +83,7 @@
                   </div>
                 </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--'}}
                 </div>
               </template>
             </pageTable>
@@ -169,7 +169,10 @@
               ref="kehu"
               :tablecols="tool.tabelCol($route.name).customerTable2.tablecols"
               :param="param3"
-            ></pageTable>
+              :custom="true"
+            >
+              <template v-slot:custom="scope">{{$t(scope.data.data[scope.data.columnname]) || '--'}}</template>
+            </pageTable>
             </showIsNone>
           </el-card>
         </div>
@@ -191,7 +194,10 @@
               ref="duishou"
               :tablecols="tool.tabelCol($route.name).duishouTable.tablecols"
               :param="param4"
-            ></pageTable>
+              :custom="true"
+            >
+              <template v-slot:custom="scope">{{$t(scope.data.data[scope.data.columnname]) || '--'}}</template>
+            </pageTable>
             </showIsNone>
           </el-card>
         </div>
@@ -225,7 +231,7 @@
                   prop="itemclassAmount"
                   :label="$t('金额')">
                   <template slot-scope="scope">
-                    {{ tool.formatAmount(scope.row.itemclassAmount || 0,2,'￥') }}
+                    {{ scope.row.itemclassAmount?tool.formatAmount(scope.row.itemclassAmount,2,'￥'):'￥0.00' }}
                   </template>
                 </el-table-column>
               </el-table>
@@ -240,16 +246,16 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'marketprice'">
-                  {{scope.data.data.marketprice && tool.formatAmount(scope.data.data.marketprice || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname] ? tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'price'">
-                  {{scope.data.data.price && tool.formatAmount(scope.data.data.price || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname] ? tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'amount'">
-                  {{scope.data.data.amount && tool.formatAmount(scope.data.data.amount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname] ? tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                 </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -281,17 +287,17 @@
               :custom="true"
             >
             <template v-slot:custom="scope">
-              <div v-if="scope.data.columnname == 'specialoffer'">
+              <div v-if="scope.data.columnname == 'specialoffer'" :style="{color:scope.data.data.specialoffer?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">
                 {{ scope.data.data.specialoffer ? $t('是') : $t('否') }}
               </div>
-              <div v-else-if="scope.data.columnname == 'sumamount'">
-                {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
+              <div v-else-if="scope.data.columnname == 'quotedpriceamount'">
+                {{scope.data.data.quotedpriceamount ? tool.formatAmount(scope.data.data.quotedpriceamount ,2,'￥'):'￥0.00'  }}
               </div>
               <div v-else-if="scope.data.columnname == 'begdate'">
-                {{scope.data.data.begdate }}-{{scope.data.data.enddate }}
+                {{scope.data.data.begdate?tool.getDataChange(scope.data.data.begdate) + $t(`至`) + tool.getDataChange(scope.data.data.enddate):'--'}}
               </div>
               <div v-else>
-                {{ $t(scope.data.data[scope.data.columnname]) }}
+                {{ $t(scope.data.data[scope.data.columnname]) || '--'}}
               </div>
             </template>
             </pageTable>
@@ -333,13 +339,20 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'signAmount'">
-                  {{scope.data.data.signAmount && tool.formatAmount(scope.data.data.signAmount || 0,2,'￥')  }}
+                  {{scope.data.data.signAmount ? tool.formatAmount(scope.data.data.signAmount ,2,'￥') :'￥0.00' }}
                 </div>
                 <div v-else-if="scope.data.columnname == 'enddate'">
                   {{scope.data.data.begdate + $t('至') + scope.data.data.enddate }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'type'">
+                  {{scope.data.data[scope.data.columnname] == '框架' ? '经销商合作协议':scope.data.data[scope.data.columnname] == '项目'?'项目协议'
+                    :scope.data.data[scope.data.columnname] == '居间'?'居间协议':scope.data.data[scope.data.columnname] == '工具借用'?'工具借用协议':'直销客户合作协议'}}
+                </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--'}}
                 </div>
               </template>
             </pageTable>
@@ -375,25 +388,28 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'sumamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'returnamount'">
-                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥0.00':'￥0.00'}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
                 </div>
                 <div v-else>
-                  {{ $t(scope.data.data[scope.data.columnname]) }}
+                  {{ $t(scope.data.data[scope.data.columnname]) || '--'}}
                 </div>
               </template>
             </pageTable>
@@ -423,7 +439,17 @@
               ref="fuwu"
               :tablecols="tool.tabelCol($route.name).serveOrderTable.tablecols"
               :param="param9"
-            ></pageTable>
+              :custom="true"
+            >
+              <template v-slot:custom="scope">
+                <div v-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                  {{$t(scope.data.data[scope.data.columnname])}}
+                </div>
+                <div v-else>
+                  {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
+                </div>
+              </template>
+            </pageTable>
             </showIsNone>
           </el-card>
         </div>

src/HDrpManagement/recvoucher/index.vue

@@ -51,6 +51,9 @@
         <div v-if="scope.data.column.columnname == 'amount'">
           <span :style="+scope.data.column.data.amount >= 0 ? 'color:green' : 'color:red'">{{ tool.formatAmount(scope.data.column.data.amount,2) }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'unwriteoffamount'">
+          <span >{{ tool.formatAmount(scope.data.column.data.unwriteoffamount,2) }}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'status'">
           <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>

src/HDrpManagement/salerPortrait/index.vue

@@ -43,7 +43,7 @@
           </el-select>
         </div>
         <div class="mt-10" style="margin-right:10px">
-          <label  class="search__label" >{{$t(`范围`)}}:</label>
+          <label  class="search__label" >{{ $t('范围') }}:</label>
           <el-date-picker
               size="small"
               @change="timeChange"
@@ -51,7 +51,7 @@
               v-model="dateSelect"
               type="daterange"
               :range-separator="$t('至')"
-             :start-placeholder="$t('开始日期')"
+              :start-placeholder="$t('开始日期')"
               :end-placeholder="$t('结束日期')"
               clearable>
           </el-date-picker>

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -47,30 +47,30 @@
           <div class="Mcontainer-header__right">
             <el-descriptions class="margin-top">
               <el-descriptions-item :label="$t('编号')">{{
-                baseInfo.hrcode
+                baseInfo.hrcode?baseInfo.hrcode:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('部门')">{{
-                baseInfo.depname
+                baseInfo.depname?baseInfo.depname:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('手机号')">{{
-                baseInfo.phonenumber
+                baseInfo.phonenumber?baseInfo.phonenumber:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('营销区域')">
-                {{ baseInfo.areaname }}</el-descriptions-item
+                {{ baseInfo.areaname?baseInfo.areaname:'--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`登录账号`)">{{
-                baseInfo.accountno
+                baseInfo.accountno?baseInfo.accountno:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('职位')">{{
-                baseInfo.position
+                baseInfo.position?baseInfo.position:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`邮箱`)">
-                {{ baseInfo.email }}</el-descriptions-item
+                {{ baseInfo.email?baseInfo.email:'--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`最低授权折扣`)"
                 ><span
                   style="color: #e85b5b; font-size: 16px; font-weight: bold"
-                  >{{ baseInfo.discountrate * 100 + "%" }}</span
+                  >{{ baseInfo.discountrate?baseInfo.discountrate * 100 + "%":'--' }}</span
                 ></el-descriptions-item
               >
               <el-descriptions-item :label="$t('状态')">
@@ -421,7 +421,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -442,7 +442,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -463,7 +463,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -484,7 +484,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -498,12 +498,15 @@
                             "￥"
                           )
                         : $t(scope.data.data[scope.data.columnname]) == 0
-                        ? "￥ 0.00"
+                        ? "￥0.00"
                         : "--"
                     }}
                   </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{$t(scope.data.data[scope.data.columnname])}}
+                  </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -585,27 +588,16 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'costofconstruction'">
-                    {{
-                      scope.data.data.costofconstruction &&
-                      tool.formatAmount(
-                        scope.data.data.costofconstruction || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.costofconstruction?tool.formatAmount(scope.data.data.costofconstruction,2,'￥'):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'totalinvestment'">
-                    {{
-                      scope.data.data.totalinvestment &&
-                      tool.formatAmount(
-                        scope.data.data.totalinvestment || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.totalinvestment?tool.formatAmount(scope.data.data.totalinvestment,2,'￥'):'￥0.00'}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -626,7 +618,7 @@
                       white-space: normal;
                     "
                   >
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -702,23 +694,35 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'sys_tag'">
-                    <el-tag
-                      size="mini"
-                      v-for="(item, index) in scope.data.data.sys_tag"
-                      :key="index"
+                    <div v-if="scope.data.data.sys_tag.length > 0">
+                      <el-tag
+                          size="mini"
+                          v-for="(item, index) in scope.data.data.sys_tag"
+                          :key="index"
                       >{{ $t(item) }}</el-tag
-                    >
+                      >
+                    </div>
+                    <div v-else>--</div>
                   </div>
                   <div v-else-if="scope.data.columnname == 'industry'">
-                    <el-tag
-                      size="mini"
-                      v-for="(item, index) in scope.data.data.industry"
-                      :key="index"
+                    <div v-if="scope.data.data.industry.length > 0">
+                      <el-tag
+                          size="mini"
+                          v-for="(item, index) in scope.data.data.industry"
+                          :key="index"
                       >{{ $t(item) }}</el-tag
-                    >
+                      >
+                    </div>
+                    <div v-else>--</div>
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'tradingstatus'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -851,24 +855,20 @@
                     >
                   </div>
                   <div v-else-if="scope.data.columnname == 'signamount_due'">
-                    {{
-                      scope.data.data.signamount_due &&
-                      tool.formatAmount(
-                        scope.data.data.signamount_due || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.signamount_due?tool.formatAmount(scope.data.data.signamount_due,2,"￥"):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'scale'">
                     {{
                       scope.data.data.scalc
                         ? $t(scope.data.data.scale) + $t(scope.data.data.unitname)
-                        : ""
+                        : "--"
                     }}
                   </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
+                  </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -950,20 +950,17 @@
                 :custom="true"
               >
                 <template v-slot:custom="scope">
-                  <div v-if="scope.data.columnname == 'specialoffer'">
+                  <div v-if="scope.data.columnname == 'specialoffer'" :style="{color:scope.data.data.specialoffer?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">
                     {{ scope.data.data.specialoffer ? $t("是") :  $t("否") }}
                   </div>
-                  <div v-else-if="scope.data.columnname == 'sumamount'">
-                    {{
-                      scope.data.data.sumamount &&
-                      tool.formatAmount(scope.data.data.sumamount || 0, 2, "￥")
-                    }}
+                  <div v-else-if="scope.data.columnname == 'quotedpriceamount'">
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'begdate'">
-                    {{ scope.data.data.begdate }}-{{ scope.data.data.enddate }}
+                    {{ tool.getDataChange(scope.data.data.begdate) }}{{$t(`至`)}}{{ tool.getDataChange(scope.data.data.enddate) }}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -1107,22 +1104,22 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'signAmount'">
-                    {{
-                      scope.data.data.signAmount &&
-                      tool.formatAmount(
-                        scope.data.data.signAmount || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.signAmount?tool.formatAmount(scope.data.data.signAmount,2,'￥'):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'enddate'">
                     {{
                       scope.data.data.begdate + $t("至") + scope.data.data.enddate
                     }}
                   </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{$t(scope.data.data[scope.data.columnname])}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'type'">
+                    {{scope.data.data[scope.data.columnname] == '框架' ? '经销商合作协议':scope.data.data[scope.data.columnname] == '项目'?'项目协议'
+                      :scope.data.data[scope.data.columnname] == '居间'?'居间协议':scope.data.data[scope.data.columnname] == '工具借用'?'工具借用协议':'直销客户合作协议'}}
+                  </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -164,7 +164,14 @@
               @blur="onConfirm([scope.column.data], true, true)"
             ></el-input>
           </div>
-          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
+          <div v-else-if="scope.column.columnname == 'cansaleqty' || scope.column.columnname == 'undeliqty' || scope.column.columnname == 'aftersalesmagqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'0'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'invoiceamount' || scope.column.columnname == 'writeoffamount' || scope.column.columnname == 'aftersalesmagamount'">
+            {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--'}}</p>
         </template>
         <template v-slot:opreation="scope">
           <!-- <el-button v-if="data.status == '新建' && data.type != '特殊订单'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">{{$t('删 除')}}</el-button> -->

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -96,7 +96,7 @@
               :label="$t(`输入数量`)"
               @change="qtyChange(scope.column.data, scope.$index)"
             ></el-input-number>
-            <span v-else>{{ scope.column.data.qty }}</span>
+            <span v-else>{{ scope.column.data.qty?scope.column.data.qty:'0' }}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'needdate'">
             <el-date-picker
@@ -170,7 +170,14 @@
               @blur="onConfirm([scope.column.data], true, true)"
             ></el-input>
           </div>
-          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
+          <div v-else-if="scope.column.columnname == 'cansaleqty' || scope.column.columnname == 'undeliqty' || scope.column.columnname == 'aftersalesmagqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'0'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'invoiceamount' || scope.column.columnname == 'writeoffamount' || scope.column.columnname == 'aftersalesmagamount'">
+            {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--' }}</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button

src/components/newLayout/index.vue

@@ -108,24 +108,21 @@ export default {
         clearTimeout(this.timer);
       }
       this.timer = setTimeout(() => {
-        if (this.$refs.menu) {
-          let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
-          if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
-            this.divTop =
-              this.$refs.menu.$refs.menuList.$el.clientHeight -
-              25 * size +
-              "px";
-          } else {
-            this.divTop = 0 + "px";
-          }
+        let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
+        if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
+          this.divTop =
+            this.$refs.menu.$refs.menuList.$el.clientHeight - 25 * size + "px";
+        } else {
+          this.divTop = 0 + "px";
         }
+
         /* this.divHeight = (this.$refs.divContent.clientHeight - this.$refs.menu.$refs.menuList.$el.clientHeight + 10) + 'px'*/
         /* if (this.$refs.menu.$el.clientWidth < 1206 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
         } else {
           this.marginTrue = false
         }*/
-      }, 1000);
+      }, 200);
     },
     goPassword() {
       this.dialogVisible = false;

src/components/newLayout/modules/header.vue

@@ -39,7 +39,18 @@
       </el-dropdown-menu>
     </el-dropdown>-->
       <!--    <el-divider direction="vertical"></el-divider>-->
-      <el-button size="mint" type="primary"  style="background-color:rgb(52 106 145);margin-right: 20px;color: #FFFFFF" v-if="(usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1')" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>
+      <el-button
+        size="mint"
+        type="primary"
+        style="
+          background-color: rgb(52 106 145);
+          margin-right: 20px;
+          color: #ffffff;
+        "
+        v-if="(usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1')"
+        @click="$router.push('/serviceDataScreen')"
+        >{{ $t(`业务数据大屏`) }}</el-button
+      >
       <svg
         t="1725853431060"
         class="icon"
@@ -144,7 +155,7 @@ export default {
       nowType: "ZH",
       languagename: "",
       usertype: JSON.parse(sessionStorage.getItem("active_account")).usertype,
-      siteid: JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid: JSON.parse(sessionStorage.getItem("active_account")).siteid,
     };
   },
   props: ["onRender"],
@@ -292,6 +303,7 @@ export default {
           .languagename || "简体中文";
       localStorage.setItem("languagename", this.languagename);
       localStorage.setItem("lang", type);
+      localStorage.setItem("languagename", this.languagename);
       this.$nextTick(() => {
         this.$i18n.locale = type;
         this.editorChangeLanguage();
@@ -342,11 +354,12 @@ export default {
       });
     },
   },
-
   mounted() {
     this.siteInfos();
     this.languagelist();
 
+    this.languagename = localStorage.getItem("languagename") ||"简体中文";
+
     try {
       this.languagename = localStorage.getItem("languagename") || "简体中文";
     } catch (error) {