Merge branch 'mergeBranch' into redUrgent

src/Form/publicCustomer/add.vue

@@ -74,30 +74,30 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="24">
-              <el-form-item :label="$t('客户等级') + ':'" prop="grade">
-                <el-select
-                  v-model="form.grade"
-                  :placeholder="$t('客户等级')"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in options.customerGrade"
-                    :key="item.rowindex"
-                    :label="$t(item.value)"
-                    :value="item.value"
-                  >
-                    <span style="float: left">{{ $t(item.value) }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 12px"
-                      >{{
-                        item.remarks ? $t(item.remarks) : $t("暂无描述")
-                      }}</span
-                    >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t('客户等级') + ':'" prop="grade">-->
+<!--                <el-select-->
+<!--                  v-model="form.grade"-->
+<!--                  :placeholder="$t('客户等级')"-->
+<!--                  style="width: 100%"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in options.customerGrade"-->
+<!--                    :key="item.rowindex"-->
+<!--                    :label="$t(item.value)"-->
+<!--                    :value="item.value"-->
+<!--                  >-->
+<!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+<!--                    <span-->
+<!--                      style="float: right; color: #8492a6; font-size: 12px"-->
+<!--                      >{{-->
+<!--                        item.remarks ? $t(item.remarks) : $t("暂无描述")-->
+<!--                      }}</span-->
+<!--                    >-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t('客户分类') + ':'" prop="customergrade">
                 <el-select
@@ -652,7 +652,7 @@ export default {
     addBtn() {
       this.industryList();
       this.gradeList();
-      this.queryCustomerGrade();
+      // this.queryCustomerGrade();
       this.getSysOption();
       this.getPublicList();
       this.enterpriseContactList();

src/Form/publicCustomer/edit.vue

@@ -69,30 +69,30 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('客户等级') + ':'">
-                <el-select
-                  v-model="form.grade"
-                  :placeholder="$t('请选择客户等级')"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in options.customerGrade"
-                    :key="item.rowindex"
-                    :label="$t(item.value)"
-                    :value="item.value"
-                  >
-                    <span style="float: left">{{ $t(item.value) }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 12px"
-                      >{{
-                        item.remarks ? $t(item.remarks) : $t("暂无描述")
-                      }}</span
-                    >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t('客户等级') + ':'">-->
+<!--                <el-select-->
+<!--                  v-model="form.grade"-->
+<!--                  :placeholder="$t('请选择客户等级')"-->
+<!--                  style="width: 100%"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in options.customerGrade"-->
+<!--                    :key="item.rowindex"-->
+<!--                    :label="$t(item.value)"-->
+<!--                    :value="item.value"-->
+<!--                  >-->
+<!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+<!--                    <span-->
+<!--                      style="float: right; color: #8492a6; font-size: 12px"-->
+<!--                      >{{-->
+<!--                        item.remarks ? $t(item.remarks) : $t("暂无描述")-->
+<!--                      }}</span-->
+<!--                    >-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t('客户分类') + ':'" prop="customergrade">
                 <el-select
@@ -558,7 +558,7 @@ export default {
     editBtn() {
       this.industryList();
       this.gradeList();
-      this.queryCustomerGrade();
+      // this.queryCustomerGrade();
       this.getSysOption();
       this.getPublicList();
       this.dialogFormVisible = true;

src/Form/salerPrivatecustomer/add.vue

@@ -69,28 +69,28 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('客户等级') + ':'" prop="grade">
-                <el-select
-                  v-model="form.grade"
-                  :placeholder="$t('请选择客户等级')"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in options.customerGrade"
-                    :key="item.rowindex"
-                    :label="$t(item.value)"
-                    :value="item.value"
-                  >
-                    <span style="float: left">{{ $t(item.value) }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 12px"
-                      >{{ item.remarks ? $t(item.remarks) : "暂无描述" }}</span
-                    >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t('客户等级') + ':'" prop="grade">-->
+<!--                <el-select-->
+<!--                  v-model="form.grade"-->
+<!--                  :placeholder="$t('请选择客户等级')"-->
+<!--                  style="width: 100%"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in options.customerGrade"-->
+<!--                    :key="item.rowindex"-->
+<!--                    :label="$t(item.value)"-->
+<!--                    :value="item.value"-->
+<!--                  >-->
+<!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+<!--                    <span-->
+<!--                      style="float: right; color: #8492a6; font-size: 12px"-->
+<!--                      >{{ item.remarks ? $t(item.remarks) : "暂无描述" }}</span-->
+<!--                    >-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t('客户分类') + ':'" prop="customergrade">
                 <el-select
@@ -738,7 +738,7 @@ export default {
       /*this.parentCustomer()*/
       this.gradeList();
       this.industryList();
-      this.queryCustomerGrade();
+      // this.queryCustomerGrade();
       this.enterpriseContactList();
     },
     /*选择工商信息*/

src/Form/salerPrivatecustomer/edit.vue

@@ -75,30 +75,30 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('客户等级') + ':'">
-                <el-select
-                  v-model="form.grade"
-                  :placeholder="$t('请选择客户等级')"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in options.customerGrade"
-                    :key="item.rowindex"
-                    :label="$t(item.value)"
-                    :value="item.value"
-                  >
-                    <span style="float: left">{{ $t(item.value) }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 12px"
-                      >{{
-                        item.remarks ? $t(item.remarks) : $t("暂无描述")
-                      }}</span
-                    >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t('客户等级') + ':'">-->
+<!--                <el-select-->
+<!--                  v-model="form.grade"-->
+<!--                  :placeholder="$t('请选择客户等级')"-->
+<!--                  style="width: 100%"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in options.customerGrade"-->
+<!--                    :key="item.rowindex"-->
+<!--                    :label="$t(item.value)"-->
+<!--                    :value="item.value"-->
+<!--                  >-->
+<!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+<!--                    <span-->
+<!--                      style="float: right; color: #8492a6; font-size: 12px"-->
+<!--                      >{{-->
+<!--                        item.remarks ? $t(item.remarks) : $t("暂无描述")-->
+<!--                      }}</span-->
+<!--                    >-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t('客户分类') + ':'" prop="customergrade">
                 <el-select
@@ -703,7 +703,7 @@ export default {
       /*this.parentCustomer()*/
       this.gradeList();
       this.industryList();
-      this.queryCustomerGrade();
+      // this.queryCustomerGrade();
       /*let arr = ['province','city','county']
       arr.forEach(e=>{
         this.data[e] !== '' ?this.form.value.push(this.data[e]):''

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -49,7 +49,7 @@
         <el-descriptions-item :label="$t('产线')">{{ basic.prodline || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t('备注')">{{ basic.specalnote || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`标准明细`)">{{ basic.standardsmx || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`标准明细`)">{{ basic.standardsmx || '/'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight || '--'}};{{$t(`净重`)}}:{{basic.weight || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`条形码`)">{{ basic.barcode}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`是否序列号管理`)" >
@@ -62,8 +62,8 @@
         <el-descriptions-item  :label="$t(`连接形式`)">{{ basic.connection || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`阀板材质`)">{{ basic.valveplatematerial || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`阀体材质`)">{{ basic.bodymaterial || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`执行器类型`)">{{ basic.actuatortype || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`执行器品牌`)">{{ basic.actuatorbrand || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`执行器类型`)">{{ basic.actuatortype || '/'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`执行器品牌`)">{{ basic.actuatorbrand || '/'}}</el-descriptions-item>
 
         <el-descriptions-item  :label="$t(`是否营销物料`)"  >
           <span :style="{color:basic.iswuliao?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">{{ basic.iswuliao ? $t('是'):$t('否')}}</span>

src/HDrpManagement/customerData/index.vue

@@ -308,136 +308,136 @@
               </div>
             </div>
             <!--客户等级-->
-            <div class="data-panel" id="customerGrad">
-              <div class="panel-content-wrapper" >
-                <div class="panel-header">
-                  <div class="title">{{$t(`客户等级情况统计`)}}</div>
-                  <div class="panel-select">
-                    <div class="mt-10 inline-16">
-                      <label  class="search__label" >{{$t('部门')}}:</label>
-                      <el-cascader
-                        :append-to-body="false"
-                        placement="bottom"
-                        ref="selectdep"
-                        size="small"
-                        v-model="gradTableParam.content.dataid"
-                        :options="deplist"
-                        :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
-                        @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"></el-cascader>
-                    </div>
-                    <div class="mt-10 inline-16">
-                      <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="gradTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
-                      :popper-append-to-body="false"
-                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"
-                      >
-                        <el-option
-                            v-for="item in gradMapParamSalesman"
-                            :key="item.index"
-                            :label="$t(item.name)"
-                            :value="item.userid">
-                        </el-option>
-                      </el-select>
-                    </div>
-                    <div class="mt-10 inline-16">
-                      <p class="search__label">{{$t('状态')}}:</p>
-                      <el-select v-model="gradTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" :placeholder="$t('请选择状态')" @change="gradMapParam.content.where.isleave = gradTableParam.content.where.isleave;gradTableParam.content.username = '';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData(null,'状态');customerGradInit(null,'状态')" >
-                        <el-option :label="$t('在职')" value="1"></el-option>
-                        <el-option :label="$t('离职')" value="2"></el-option>
-                      </el-select>
-                    </div>
-                    <div class="mt-10 inline-16">
-                      <el-button-group>
-                        <el-button :type="gradTableParam.content.dateType === '全部'?'primary':''" size="small" @click="gradMapParam.content.dateType = '全部';gradTableParam.content.dateType = '全部';
-                          gradMapParam.content.where.begdate = '';gradMapParam.content.where.enddate = '';gradTableParam.content.where.begdate = '';gradTableParam.content.where.enddate = '';gradDate = []
-                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">{{$t(`全部`)}}</el-button>
-                        <el-button :type="gradTableParam.content.dateType === '本年'?'primary':''" size="small" @click="gradMapParam.content.dateType = '本年';gradTableParam.content.dateType = '本年';
-                          gradDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];gradMapParam.content.where.begdate = new Date().getFullYear() + '-01';gradMapParam.content.where.enddate = new Date().getFullYear() + '-12';
-                          gradTableParam.content.where.begdate = new Date().getFullYear() + '-01';gradTableParam.content.where.enddate = new Date().getFullYear() + '-12';
-                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">{{$t(`本年`)}}</el-button>
-                      </el-button-group>
-                    </div>
-                    <div class="mt-10 inline-16">
-                      <el-date-picker
-                          v-show="isFull"
-                          :append-to-body="false"
-                          v-model="gradDate"
-                          :clearable="false"
-                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
-                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"
-                          size="small"
-                          format="yyyy-MM"
-                          value-format="yyyy-MM"
-                          type="monthrange"
-                          :range-separator="$t('至')"
-                          :start-placeholder="$t('开始月份')"
-                          :end-placeholder="$t('结束月份')">
-                      </el-date-picker>
-                      <el-date-picker
-                          v-show="!isFull"
-                          v-model="gradDate"
-                          :clearable="false"
-                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
-                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"
-                          size="small"
-                          format="yyyy-MM"
-                          value-format="yyyy-MM"
-                          type="monthrange"
-                          :range-separator="$t('至')"
-                          :start-placeholder="$t('开始月份')"
-                          :end-placeholder="$t('结束月份')">
-                      </el-date-picker>
-                    </div>
-                    <div class="mt-10 inline-15">
-                      <exportFile  :param="gradTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户等级情况统计" :dataid="gradMapParam.content.dataid"></exportFile>
-                    </div>
-                    <div style="display: inline-block;vertical-align: middle">
-                      <FullScroll domId="customerGrad" @onFull="onFull" @backFull="backFull"></FullScroll>
-                    </div>
-                  </div>
-                </div>
-                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
-                  <div ref="customerGradEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
-                    <pageTable
-                      ref="customerGradTable"
-                      :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
-                      :param="gradTableParam"
-                      setName="gradTable"
-                      :custom="true"
-                      @detailSet="detailSet"
-                    >
-                      <template v-slot:custom="scope">
-                        <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>
-                        </div>
-                        <div v-else-if="scope.data.columnname == 'operation'">
-<!--                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerGradTable',gradTableParam,'sa_customersid')" :disabled="isFull">{{$t('详情')}}</el-button>-->
-                          <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
-                                      :listqueryid="detailDataSet.gradTable.listqueryid" :total="detailDataSet.gradTable.total" :overview="true"></drawerTemp>
-                        </div>
-                        <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>
-                        </div>
-                        <div v-else-if="scope.data.columnname === 'tradingstatus'">
-                          <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
-                          <span style="color:#fa8c16" v-else-if="scope.data.data[[scope.data.columnname]] == '已成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
-                          <span style="color:#333333" v-else-if="scope.data.data[[scope.data.columnname]] == '多次成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
-                        </div>
-                        <div v-else-if="scope.data.columnname === 'status'">
-                          <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '潜在'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
-                          <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]] == '已终止'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
-                        </div>
-                        <div v-else>
-                          {{ $t(scope.data.data[scope.data.columnname]) }}
-                        </div>
-                      </template>
-                    </pageTable>
-                  </div>
-                </div>
-              </div>
-            </div>
+<!--            <div class="data-panel" id="customerGrad">-->
+<!--              <div class="panel-content-wrapper" >-->
+<!--                <div class="panel-header">-->
+<!--                  <div class="title">{{$t(`客户等级情况统计`)}}</div>-->
+<!--                  <div class="panel-select">-->
+<!--                    <div class="mt-10 inline-16">-->
+<!--                      <label  class="search__label" >{{$t('部门')}}:</label>-->
+<!--                      <el-cascader-->
+<!--                        :append-to-body="false"-->
+<!--                        placement="bottom"-->
+<!--                        ref="selectdep"-->
+<!--                        size="small"-->
+<!--                        v-model="gradTableParam.content.dataid"-->
+<!--                        :options="deplist"-->
+<!--                        :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"-->
+<!--                        @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"></el-cascader>-->
+<!--                    </div>-->
+<!--                    <div class="mt-10 inline-16">-->
+<!--                      <label  class="search__label" >{{$t('业务员')}}:</label>-->
+<!--                      <el-select v-model="gradTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"-->
+<!--                      :popper-append-to-body="false"-->
+<!--                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"-->
+<!--                      >-->
+<!--                        <el-option-->
+<!--                            v-for="item in gradMapParamSalesman"-->
+<!--                            :key="item.index"-->
+<!--                            :label="$t(item.name)"-->
+<!--                            :value="item.userid">-->
+<!--                        </el-option>-->
+<!--                      </el-select>-->
+<!--                    </div>-->
+<!--                    <div class="mt-10 inline-16">-->
+<!--                      <p class="search__label">{{$t('状态')}}:</p>-->
+<!--                      <el-select v-model="gradTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" :placeholder="$t('请选择状态')" @change="gradMapParam.content.where.isleave = gradTableParam.content.where.isleave;gradTableParam.content.username = '';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData(null,'状态');customerGradInit(null,'状态')" >-->
+<!--                        <el-option :label="$t('在职')" value="1"></el-option>-->
+<!--                        <el-option :label="$t('离职')" value="2"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </div>-->
+<!--                    <div class="mt-10 inline-16">-->
+<!--                      <el-button-group>-->
+<!--                        <el-button :type="gradTableParam.content.dateType === '全部'?'primary':''" size="small" @click="gradMapParam.content.dateType = '全部';gradTableParam.content.dateType = '全部';-->
+<!--                          gradMapParam.content.where.begdate = '';gradMapParam.content.where.enddate = '';gradTableParam.content.where.begdate = '';gradTableParam.content.where.enddate = '';gradDate = []-->
+<!--                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">{{$t(`全部`)}}</el-button>-->
+<!--                        <el-button :type="gradTableParam.content.dateType === '本年'?'primary':''" size="small" @click="gradMapParam.content.dateType = '本年';gradTableParam.content.dateType = '本年';-->
+<!--                          gradDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];gradMapParam.content.where.begdate = new Date().getFullYear() + '-01';gradMapParam.content.where.enddate = new Date().getFullYear() + '-12';-->
+<!--                          gradTableParam.content.where.begdate = new Date().getFullYear() + '-01';gradTableParam.content.where.enddate = new Date().getFullYear() + '-12';-->
+<!--                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">{{$t(`本年`)}}</el-button>-->
+<!--                      </el-button-group>-->
+<!--                    </div>-->
+<!--                    <div class="mt-10 inline-16">-->
+<!--                      <el-date-picker-->
+<!--                          v-show="isFull"-->
+<!--                          :append-to-body="false"-->
+<!--                          v-model="gradDate"-->
+<!--                          :clearable="false"-->
+<!--                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];-->
+<!--                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"-->
+<!--                          size="small"-->
+<!--                          format="yyyy-MM"-->
+<!--                          value-format="yyyy-MM"-->
+<!--                          type="monthrange"-->
+<!--                          :range-separator="$t('至')"-->
+<!--                          :start-placeholder="$t('开始月份')"-->
+<!--                          :end-placeholder="$t('结束月份')">-->
+<!--                      </el-date-picker>-->
+<!--                      <el-date-picker-->
+<!--                          v-show="!isFull"-->
+<!--                          v-model="gradDate"-->
+<!--                          :clearable="false"-->
+<!--                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];-->
+<!--                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"-->
+<!--                          size="small"-->
+<!--                          format="yyyy-MM"-->
+<!--                          value-format="yyyy-MM"-->
+<!--                          type="monthrange"-->
+<!--                          :range-separator="$t('至')"-->
+<!--                          :start-placeholder="$t('开始月份')"-->
+<!--                          :end-placeholder="$t('结束月份')">-->
+<!--                      </el-date-picker>-->
+<!--                    </div>-->
+<!--                    <div class="mt-10 inline-15">-->
+<!--                      <exportFile  :param="gradTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户等级情况统计" :dataid="gradMapParam.content.dataid"></exportFile>-->
+<!--                    </div>-->
+<!--                    <div style="display: inline-block;vertical-align: middle">-->
+<!--                      <FullScroll domId="customerGrad" @onFull="onFull" @backFull="backFull"></FullScroll>-->
+<!--                    </div>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">-->
+<!--                  <div ref="customerGradEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>-->
+<!--                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">-->
+<!--                    <pageTable-->
+<!--                      ref="customerGradTable"-->
+<!--                      :tablecols="tool.tabelCol($route.name).typeTable.tablecols"-->
+<!--                      :param="gradTableParam"-->
+<!--                      setName="gradTable"-->
+<!--                      :custom="true"-->
+<!--                      @detailSet="detailSet"-->
+<!--                    >-->
+<!--                      <template v-slot:custom="scope">-->
+<!--                        <div v-if="scope.data.columnname == 'sys_tag'">-->
+<!--                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>-->
+<!--                        </div>-->
+<!--                        <div v-else-if="scope.data.columnname == 'operation'">-->
+<!--&lt;!&ndash;                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerGradTable',gradTableParam,'sa_customersid')" :disabled="isFull">{{$t('详情')}}</el-button>&ndash;&gt;-->
+<!--                          <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"-->
+<!--                                      :listqueryid="detailDataSet.gradTable.listqueryid" :total="detailDataSet.gradTable.total" :overview="true"></drawerTemp>-->
+<!--                        </div>-->
+<!--                        <div v-else-if="scope.data.columnname === 'industry'">-->
+<!--                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>-->
+<!--                        </div>-->
+<!--                        <div v-else-if="scope.data.columnname === 'tradingstatus'">-->
+<!--                          <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>-->
+<!--                          <span style="color:#fa8c16" v-else-if="scope.data.data[[scope.data.columnname]] == '已成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>-->
+<!--                          <span style="color:#333333" v-else-if="scope.data.data[[scope.data.columnname]] == '多次成交'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>-->
+<!--                        </div>-->
+<!--                        <div v-else-if="scope.data.columnname === 'status'">-->
+<!--                          <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '潜在'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>-->
+<!--                          <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]] == '已终止'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>-->
+<!--                        </div>-->
+<!--                        <div v-else>-->
+<!--                          {{ $t(scope.data.data[scope.data.columnname]) }}-->
+<!--                        </div>-->
+<!--                      </template>-->
+<!--                    </pageTable>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
             <!--客户联系人-->
             <div class="data-panel" id="customerContact">
               <div class="panel-content-wrapper" >

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -238,10 +238,10 @@ export default {
           label:'客户类型',
           value:this.mainData.type
         },
-        {
-          label:'客户等级',
-          value:this.mainData.grade === 0?'':this.mainData.grade
-        },
+        // {
+        //   label:'客户等级',
+        //   value:this.mainData.grade === 0?'':this.mainData.grade
+        // },
         {
           label:'客户分类',
           value:this.mainData.customergrade

src/HDrpManagement/publicCustomer/modules/detail/detailedData.vue

@@ -9,7 +9,7 @@
         <el-descriptions-item :label="$t(`企业简称`)">{{ basic.abbreviation?basic.abbreviation:"--"}}</el-descriptions-item>
         <el-descriptions-item :label="$t('客户类型')">{{ basic.type?basic.type:"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" :label="$t(`客户等级`)">{{ basic.grade?$t(basic.grade):"--" }}</el-descriptions-item>
+<!--        <el-descriptions-item label-class-name="my-label" :label="$t(`客户等级`)">{{ basic.grade?$t(basic.grade):"&#45;&#45;" }}</el-descriptions-item>-->
         <el-descriptions-item label-class-name="my-label" :label="$t(`客户分类`)">{{ basic.customergrade?$t(basic.customergrade):"--" }}</el-descriptions-item>
 
         <el-descriptions-item label-class-name="my-label" :label="$t(`客户行业`)">

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -186,78 +186,29 @@
               width: 100%;
               background: #f6f6f6;
               margin-bottom: 20px;
-              padding: 20px 0 10px 20px;
+              padding: 10px 0 10px 20px;
             "
-            v-if="selectProduct.itemextend"
+            class="detail-style"
+            v-if="selectProduct.itemextend && selectProduct.itemextend.length"
           >
-            <el-row :gutter="20" v-if="selectProduct.itemextend.length">
-              <el-col :span="8" v-if="selectProduct.itemextend[0].device && siteid != 'HY'" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("装置") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].device
-                }}</span>
-              </el-col>
-              <el-col :span="8" v-if="selectProduct.itemextend[0].prodline" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("产线") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].prodline
-                }}</span>
-              </el-col>
-              <el-col :span="8" v-if="selectProduct.itemextend[0].pressure && siteid != 'HY'" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("压力等级") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].pressure
-                }}</span>
-              </el-col>
-              <el-col
-                :span="8"
-                v-if="selectProduct.itemextend[0].butterflyplatedrive && siteid != 'HY'"
-                style="margin-bottom: 10px"
-              >
-                <span class="search__label" >{{ $t("蝶板驱动") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].butterflyplatedrive
-                }}</span>
-              </el-col>
-              <el-col :span="8" v-if="selectProduct.itemextend[0].connection && siteid != 'HY'" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("连接形式") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].connection
-                }}</span>
-              </el-col>
-              <el-col
-                :span="8"
-                v-if="selectProduct.itemextend[0].valveplatematerial && siteid != 'HY'"
-                style="margin-bottom: 10px"
-              >
-                <span class="search__label">{{ $t("阀板材质") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].valveplatematerial
-                }}</span>
-              </el-col>
-              <el-col :span="8" v-if="selectProduct.itemextend[0].actuatortype" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("执行器类型") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].actuatortype
-                }}</span>
-              </el-col>
-              <el-col
-                :span="8"
-                v-if="selectProduct.itemextend[0].actuatorbrand"
-                style="margin-bottom: 10px"
-              >
-                <span class="search__label">{{ $t("执行器品牌") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].actuatorbrand
-                }}</span>
-              </el-col>
-              <el-col :span="8" style="margin-bottom: 10px" v-if="selectProduct.itemextend[0].specalnote">
-                <span class="search__label">{{ $t("备注") }}:</span>
-                <span class="tab-color">{{
-                    selectProduct.itemextend[0].specalnote
-                  }}</span>
-              </el-col>
-            </el-row>
+            <itemextend v-if="selectProduct.itemextend[0].device && siteid != 'HY'"
+                        title="装置" :data="selectProduct.itemextend[0].device"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].prodline"
+                        title="产线" :data="selectProduct.itemextend[0].prodline"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].pressure && siteid != 'HY'"
+                        title="压力等级" :data="selectProduct.itemextend[0].pressure"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].butterflyplatedrive && siteid != 'HY'"
+                        title="蝶板驱动" :data="selectProduct.itemextend[0].butterflyplatedrive"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].connection && siteid != 'HY'"
+                        title="连接形式" :data="selectProduct.itemextend[0].connection"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].valveplatematerial && siteid != 'HY'"
+                        title="阀板材质" :data="selectProduct.itemextend[0].valveplatematerial"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].actuatortype"
+                        title="执行器类型" :data="selectProduct.itemextend[0].actuatortype"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].actuatorbrand"
+                        title="执行器品牌" :data="selectProduct.itemextend[0].actuatorbrand"></itemextend>
+            <itemextend v-if="selectProduct.itemextend[0].specalnote"
+                        title="备注" :data="selectProduct.itemextend[0].specalnote"></itemextend>
           </div>
         </div>
 
@@ -284,8 +235,10 @@
 </template>
 
 <script>
+import itemextend from "@/SDrpManagement/ProductGroup/modules/itemextend";
 export default {
   name: "",
+  components:{itemextend},
   data() {
     return {
       detail: "",
@@ -577,4 +530,9 @@ export default {
   font-size: 15px;
   /*font-weight: bold;*/
 }
+.detail-style::after {
+  content: "";
+  display: table;
+  clear: both;
+}
 </style>

src/SDrpManagement/ProductGroup/modules/itemextend.vue

@@ -0,0 +1,21 @@
+<template>
+  <div style="width: 290px;float: left">
+    <span class="search__label">{{title}}:</span>
+    <span class="tab-color">{{data}}</span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "itemextend",
+  props:['title','data']
+}
+</script>
+
+<style scoped>
+.tab-color {
+  color: #ec2121;
+  font-size: 15px;
+  /*font-weight: bold;*/
+}
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -383,10 +383,10 @@ export default {
           label: "客户类型",
           value: this.mainData.type,
         },
-        {
-          label: "客户等级",
-          value: this.mainData.grade === 0 ? "" : this.mainData.grade,
-        },
+        // {
+        //   label: "客户等级",
+        //   value: this.mainData.grade === 0 ? "" : this.mainData.grade,
+        // },
         {
           label: "客户分类",
           value: this.mainData.customergrade,

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -42,11 +42,11 @@
           >{{ data.type ? $t(data.type) : "--" }}</el-descriptions-item
         >
 
-        <el-descriptions-item
-          label-class-name="my-label"
-          :label="$t(`客户等级`)"
-          >{{ data.grade ? data.grade : "--" }}</el-descriptions-item
-        >
+<!--        <el-descriptions-item-->
+<!--          label-class-name="my-label"-->
+<!--          :label="$t(`客户等级`)"-->
+<!--          >{{ data.grade ? data.grade : "&#45;&#45;" }}</el-descriptions-item-->
+<!--        >-->
         <el-descriptions-item
           label-class-name="my-label"
           :label="$t(`客户分类`)"

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -42,20 +42,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('客户等级')+':'" prop="grade">
-                <el-select v-model="form.grade" :placeholder="$t('请选择客户等级')" style="width: 100%">
-                  <el-option
-                      v-for="item in options.customerGrade"
-                      :key="item.rowindex"
-                      :label="$t(item.value)"
-                      :value="item.value">
-                    <span style="float: left">{{ $t(item.value) }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t('客户等级')+':'" prop="grade">-->
+<!--                <el-select v-model="form.grade" :placeholder="$t('请选择客户等级')" style="width: 100%">-->
+<!--                  <el-option-->
+<!--                      v-for="item in options.customerGrade"-->
+<!--                      :key="item.rowindex"-->
+<!--                      :label="$t(item.value)"-->
+<!--                      :value="item.value">-->
+<!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+<!--                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t('客户分类')+':'" prop="customergrade">
                 <el-select v-model="form.customergrade" :placeholder="$t('请选择客户分类')" style="width: 100%">
@@ -494,7 +494,7 @@ export default {
       this.gradeList()
       this.industryList()
       this.typeList()
-      this.queryCustomerGrade()
+      // this.queryCustomerGrade()
       this.enterpriseContactList()
     },
     /*查重检查*/

src/SManagement/orderclue_detail/components/customerAudit.vue

@@ -27,11 +27,11 @@
                 <el-input v-model="form.type" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t(`客户等级`)+':'" prop="grade">
-                <el-input v-model="form.grade" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="24">-->
+<!--              <el-form-item :label="$t(`客户等级`)+':'" prop="grade">-->
+<!--                <el-input v-model="form.grade" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="24">
               <el-form-item :label="$t(`客户分类`)+':'" prop="customergrade">
                 <el-input v-model="form.customergrade" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>

src/views/salesData/components/boxLine.vue

@@ -129,13 +129,13 @@
                   param.content.dateType == '本年' ||
                   param.content.dateType == '去年'
                 "
-                >{{ $t("年同比") }}</span
+                >{{ $t("年环比") }}</span
               >
               <span v-else-if="param.content.dateType == '本季'">{{
-                $t("季同比")
+                $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
-                $t("月同比")
+                $t("月环比")
               }}</span>
               <i class="el-icon-caret-top" style="color: #2ad72a"></i
               ><span class="box-size-color"
@@ -148,13 +148,13 @@
                   param.content.dateType == '本年' ||
                   param.content.dateType == '去年'
                 "
-                >{{ $t("年同比") }}</span
+                >{{ $t("年环比") }}</span
               >
               <span v-else-if="param.content.dateType == '本季'">{{
-                $t("季同比")
+                $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
-                $t("月同比")
+                $t("月环比")
               }}</span>
               <span class="box-size-color" style="margin-left: 10px"
                 >{{ Math.round(list.hbxsje * 100 * 100) / 100 }}%</span
@@ -166,13 +166,13 @@
                   param.content.dateType == '本年' ||
                   param.content.dateType == '去年'
                 "
-                >{{ $t("年同比") }}</span
+                >{{ $t("年环比") }}</span
               >
               <span v-else-if="param.content.dateType == '本季'">{{
-                $t("季同比")
+                $t("季环比")
               }}</span>
               <span v-else-if="param.content.dateType == '本月'">{{
-                $t("月同比")
+                $t("月环比")
               }}</span>
               <i class="el-icon-caret-bottom" style="color: red"></i
               ><span class="box-size-color"