Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -109,45 +109,45 @@
             <el-row>
               <el-col :span="10" :offset="6">
                 <el-divider>
-                  <span class="title-font">{{$t(`本年`)}}</span>
+                  <span class="title-font">{{$t(`上月`)}}</span>
                 </el-divider>
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增线索','年',4)">
+                <div @click="onClick('新增线索','上月',5)">
                   <div>{{$t(`新增线索`)}}</div>
-                  <div class="title-font" style="color: #3874F6">{{list.bnxsxz}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.syxsxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('跟进线索','年',4)">
+                <div  @click="onClick('跟进线索','上月',5)">
                   <div>{{$t(`跟进线索`)}}</div>
-                  <div class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.syxsgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增客户','年',4)">
+                <div @click="onClick('新增客户','上月',5)">
                   <div>{{$t(`新增客户`)}}</div>
-                  <div class="title-font" style="color: #3874F6">{{list.bnkhxz}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.sykhxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('客户跟进','年',4)">
+                <div @click="onClick('客户跟进','上月',5)">
                   <div>{{$t(`客户跟进`)}}</div>
-                  <div class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.sykhgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增项目','年',4)">
+                <div  @click="onClick('新增项目','上月',5)">
                   <div>{{$t(`新增项目`)}}</div>
-                  <div class="title-font" style="color: #F09E00">{{list.bnxmxz}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.syxmxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('项目跟进','年',4)">
+                <div @click="onClick('项目跟进','上月',5)">
                   <div>{{$t(`项目跟进`)}}</div>
-                  <div class="title-font" style="color: #FF7602">{{list.bnxmgj}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.syxmgj}}</div>
                 </div>
               </el-col>
             </el-row>
@@ -160,45 +160,45 @@
             <el-row>
               <el-col :span="10" :offset="6">
                 <el-divider>
-                  <span class="title-font">{{$t(`上月`)}}</span>
+                  <span class="title-font">{{$t(`本年`)}}</span>
                 </el-divider>
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增线索','上月',5)">
+                <div @click="onClick('新增线索','年',4)">
                   <div>{{$t(`新增线索`)}}</div>
-                  <div class="title-font" style="color: #3874F6">{{list.syxsxz}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bnxsxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div  @click="onClick('跟进线索','上月',5)">
+                <div @click="onClick('跟进线索','年',4)">
                   <div>{{$t(`跟进线索`)}}</div>
-                  <div class="title-font" style="color: #16BDFF">{{list.syxsgj}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增客户','上月',5)">
+                <div @click="onClick('新增客户','年',4)">
                   <div>{{$t(`新增客户`)}}</div>
-                  <div class="title-font" style="color: #3874F6">{{list.sykhxz}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bnkhxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('客户跟进','上月',5)">
+                <div @click="onClick('客户跟进','年',4)">
                   <div>{{$t(`客户跟进`)}}</div>
-                  <div class="title-font" style="color: #16BDFF">{{list.sykhgj}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div  @click="onClick('新增项目','上月',5)">
+                <div @click="onClick('新增项目','年',4)">
                   <div>{{$t(`新增项目`)}}</div>
-                  <div class="title-font" style="color: #F09E00">{{list.syxmxz}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bnxmxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('项目跟进','上月',5)">
+                <div @click="onClick('项目跟进','年',4)">
                   <div>{{$t(`项目跟进`)}}</div>
-                  <div class="title-font" style="color: #FF7602">{{list.syxmgj}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bnxmgj}}</div>
                 </div>
               </el-col>
             </el-row>

src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -208,19 +208,19 @@
         </borderTemp>
       </el-col>
       <el-col
-        style="margin-bottom: 20px"
-        :xs="24"
-        :sm="24"
-        :md="24"
-        :lg="12"
-        :xl="8"
+          style="margin-bottom: 20px"
+          :xs="24"
+          :sm="24"
+          :md="24"
+          :lg="12"
+          :xl="8"
       >
         <borderTemp>
           <template #content>
             <el-row>
               <el-col :span="10" :offset="6">
                 <el-divider>
-                  <span class="title-font">{{ $t(`本年`) }}</span>
+                  <span class="title-font">{{ $t(`上月`) }}</span>
                 </el-divider>
               </el-col>
             </el-row>
@@ -242,66 +242,67 @@
             <el-row :gutter="20" class="content-title">
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                  ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.bnxsje > 10000">
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.syxsje > 10000">
                     {{
                       tool.formatAmount(
-                        tool.unitConversion(list.bnxsje, 10000),
-                        2
+                          tool.unitConversion(list.syxsje, 10000),
+                          2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.bnxsje, 2) }}
+                    {{ tool.formatAmount(list.syxsje, 2) }}
                   </span>
                 </span>
               </el-col>
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                  ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.bnchje > 10000">
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.sychje > 10000">
                     {{
                       tool.formatAmount(
-                        tool.unitConversion(list.bnchje, 10000),
-                        2
+                          tool.unitConversion(list.sychje, 10000),
+                          2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.bnchje, 2) }}
+                    {{ tool.formatAmount(list.sychje, 2) }}
                   </span>
                 </span>
               </el-col>
 
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                  ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.bnkpje > 10000">
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.sykpje > 10000">
                     {{
                       tool.formatAmount(
-                        tool.unitConversion(list.bnkpje, 10000),
-                        2
+                          tool.unitConversion(list.sykpje, 10000),
+                          2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.bnkpje, 2) }}
+                    {{ tool.formatAmount(list.sykpje, 2) }}
                   </span>
                 </span>
               </el-col>
+
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                  ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.bnskje > 10000">
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.syskje > 10000">
                     {{
                       tool.formatAmount(
-                        tool.unitConversion(list.bnskje, 10000),
-                        2
+                          tool.unitConversion(list.syskje, 10000),
+                          2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.bnskje, 2) }}
+                    {{ tool.formatAmount(list.syskje, 2) }}
                   </span>
                 </span>
               </el-col>
@@ -310,19 +311,19 @@
         </borderTemp>
       </el-col>
       <el-col
-          style="margin-bottom: 20px"
-          :xs="24"
-          :sm="24"
-          :md="24"
-          :lg="12"
-          :xl="8"
+        style="margin-bottom: 20px"
+        :xs="24"
+        :sm="24"
+        :md="24"
+        :lg="12"
+        :xl="8"
       >
         <borderTemp>
           <template #content>
             <el-row>
               <el-col :span="10" :offset="6">
                 <el-divider>
-                  <span class="title-font">{{ $t(`上月`) }}</span>
+                  <span class="title-font">{{ $t(`本年`) }}</span>
                 </el-divider>
               </el-col>
             </el-row>
@@ -344,67 +345,66 @@
             <el-row :gutter="20" class="content-title">
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.syxsje > 10000">
+                  ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.bnxsje > 10000">
                     {{
                       tool.formatAmount(
-                          tool.unitConversion(list.syxsje, 10000),
-                          2
+                        tool.unitConversion(list.bnxsje, 10000),
+                        2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.syxsje, 2) }}
+                    {{ tool.formatAmount(list.bnxsje, 2) }}
                   </span>
                 </span>
               </el-col>
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.sychje > 10000">
+                  ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.bnchje > 10000">
                     {{
                       tool.formatAmount(
-                          tool.unitConversion(list.sychje, 10000),
-                          2
+                        tool.unitConversion(list.bnchje, 10000),
+                        2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.sychje, 2) }}
+                    {{ tool.formatAmount(list.bnchje, 2) }}
                   </span>
                 </span>
               </el-col>
 
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.sykpje > 10000">
+                  ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.bnkpje > 10000">
                     {{
                       tool.formatAmount(
-                          tool.unitConversion(list.sykpje, 10000),
-                          2
+                        tool.unitConversion(list.bnkpje, 10000),
+                        2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.sykpje, 2) }}
+                    {{ tool.formatAmount(list.bnkpje, 2) }}
                   </span>
                 </span>
               </el-col>
-
               <el-col :span="6">
                 <span class="title-font" style="color: #333"
-                ><span style="font-size: 12px">¥</span>
-                  <span v-if="list.syskje > 10000">
+                  ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.bnskje > 10000">
                     {{
                       tool.formatAmount(
-                          tool.unitConversion(list.syskje, 10000),
-                          2
+                        tool.unitConversion(list.bnskje, 10000),
+                        2
                       ) + $t("万")
                     }}
                   </span>
                   <span v-else>
-                    {{ tool.formatAmount(list.syskje, 2) }}
+                    {{ tool.formatAmount(list.bnskje, 2) }}
                   </span>
                 </span>
               </el-col>

src/HDrpManagement/dispatch/details/index.vue

@@ -21,7 +21,7 @@
         <dialogTemplate v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></dialogTemplate>
         <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.status == '提交'" btnTitle="撤回" :disabled="mainData.status !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
         <el-button style="margin-left: 0px" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '复核' && mainData.status !== '关闭'"  @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
-        <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.status !== '审核' && mainData.status !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.status !== '关闭'" :disabled="mainData.status !== '审核' && mainData.status !== '复核'" @click="onReCheck">{{mainData.status === '复核'?$t('反复核'):$t('复核')}}</el-button>
+        <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.status !== '审核' && mainData.status !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.status !== '关闭' && dispatch_recheck != 0" :disabled="mainData.status !== '审核' && mainData.status !== '复核'" @click="onReCheck">{{mainData.status === '复核'?$t('反复核'):$t('复核')}}</el-button>
         <el-button :type="mainData.status != '新建' && mainData.status != '关闭'?'':'primary'" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.status != '新建' && mainData.status != '关闭'">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot2" >
@@ -48,7 +48,9 @@ import dialogTemplate from "@/components/dialogTemplate/index";
     data() {
       return {
         mainData:{},
-        mainAreaData:{}
+        mainAreaData:{},
+        dispatch_recheck:'',
+        siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
       }
     },
     components:{
@@ -242,10 +244,21 @@ import dialogTemplate from "@/components/dialogTemplate/index";
           });
         });
 
+      },
+      async isReCheck(){
+        const res = await this.$api.requested({
+          classname: "sysmanage.site.site",
+          method: "querySite_Parameter",
+          content:{
+            siteid:this.siteid
+          }
+        })
+        this.dispatch_recheck = res.data.dispatch_recheck
+        console.log(this.dispatch_recheck,'dispatch_recheck')
       }
     },
     mounted () {
-
+      this.isReCheck()
     },
     created() {
       this.queryMainData(this.$route.query.id)

src/HDrpManagement/orderManage/details/index.vue

@@ -17,10 +17,11 @@
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation"  v-if="Object.keys(mainData).length > 0">
           <!-- <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && (mainData.status == '新建')" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" /> -->
-          <Edit style="display: inline-block !important;"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
+          <Edit style="display: inline-block !important;margin-left: -10px"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
 <!--          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />-->
-          <EditRemark style="margin-right: 20px !important;"  :data="mainData" @onSuccess="queryMainData"></EditRemark>
-          <changeSaler class="inline-16" style="margin-left: -10px" ref="saler" @selectRow="salerChange">
+          <EditRemark style="margin-right: 20px !important;" v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
+          <EditRemark style="margin-right: 20px !important;margin-left: -10px" v-if="mainData.status !== '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
+          <changeSaler class="inline-16" style="margin-left: -10px" ref="saler" @selectRow="salerChange" :isPlain="true">
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">{{$t(`变更业务员`)}}</el-button>
           </changeSaler>
           <el-button v-if="tool.checkAuth($route.name,'confirmDate') && mainData.status === '交期待确认'"  class="inline-16"  type="primary" size="mini" @click="confirmdate">{{$t(`确认交期`)}}</el-button>

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -1141,7 +1141,7 @@ import myRadio from "@/HDrpManagement/customerPortrait/modules/myRadio";
 export default {
   name: "index",
   components: { showIsNone, pageTable, myCard, myTag, myRadio, myNewCard },
-  props: ["data"],
+  props: ["data","hrid"],
   data() {
     return {
       dialogFormVisible: false,
@@ -1151,7 +1151,7 @@ export default {
         id: 20230717100404,
         content: {
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1165,7 +1165,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             type: "",
             begdate: "",
@@ -1187,7 +1187,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1201,7 +1201,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1215,7 +1215,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1229,7 +1229,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1243,7 +1243,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1257,7 +1257,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             begdate: "",
             enddate: "",
@@ -1271,7 +1271,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             type: "",
             begdate: "",
@@ -1286,7 +1286,7 @@ export default {
           pageNumber: 1,
           pageSize: 20,
           type: 1,
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
           where: {
             type: "",
             begdate: "",
@@ -1305,11 +1305,10 @@ export default {
       let res = await this.$api.requested({
         id: 20230717100304,
         content: {
-          hrid: this.$route.query.id,
+          hrid: this.hrid?this.hrid:this.$route.query.id,
         },
       });
-      this.baseInfo = res.data[0];
-      console.log(this.baseInfo, "基本信息");
+      this.baseInfo = res.data.length > 0?res.data[0]:'';
     },
     async getPerformance() {
       let res = await this.$api.requested(this.param1);

src/HManagement/marketing2/agent/details/modules/field/index.vue

@@ -54,7 +54,7 @@ import add from './add'
         dialogVisible:false,
         selectRows:[],
         param:{
-          "id": 20221223141802,
+          "id": 2025061911194602,
           "content": {
               "sys_enterpriseid": 0,
               "pageNumber": 1,

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -17,7 +17,7 @@
       </div>
       <div slot="customOperation" >
         <div class="inline-16">
-          <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData"></PortraitDetail>
+          <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData" :hrid="mainData.hrid"></PortraitDetail>
           <el-button type="primary" size="mini" @click="portraitShowFun">{{ $t('360°画像') }}</el-button>
         </div>
         <!-- <mindmap class="inline-16" ref="mindmap" :id="mainData.hrid" name="saler"></mindmap> -->
@@ -44,7 +44,8 @@ import detailed from './modules/detailedData'
 import TradefieldList from './modules/tradefieldList'
 import areaBase from './modules/areaBase/index'
 import mindmap from "@/components/mindmap/index.vue";
-import PortraitDetail from './modules/Prortraitdetail.vue'
+// import PortraitDetail from './modules/Prortraitdetail.vue'
+import PortraitDetail from '@/HDrpManagement/salerPortrait/modules/detail.vue'
 import accountInfo from './modules/accountInfo.vue'
 
 export default {

src/HManagement/marketing2/saler/index.vue

@@ -7,7 +7,7 @@
       <basicLayout
         ref="basicLayout"
         formPath="marketing2/saler"
-        tableName="salerTable"
+        tableName="salerListTable"
         :idName="['sa_saleareaid','sa_salearea_hrid','hrid']"
         :apiId="{query:20221011144603,del:20221011144803}"
         :autoQuery="false"

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

@@ -53,6 +53,9 @@
         <p style="color: #888; margin-bottom: 10px">
           {{ $t("编码") }}:&emsp;{{ $t(selectProduct.itemno) }}
         </p>
+        <p style="color: #888; margin-bottom: 10px">
+          {{ $t("品号") }}:&emsp;{{ $t(stockData.erpitemno) }}
+        </p>
         <p class="normal-margin">
           {{ $t("价格") }}:&emsp;<span class="product-price"
             >¥{{ selectProduct.gradeprice }}</span

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -6,14 +6,14 @@
           :class="areaBase === '' ? 'act' : ''"
           class="brand-item border-all"
           style="float: left"
-          v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+
           @click="clickAreaBase('')"
         >
           {{ $t("全部标准") }}
         </li>
         <li
           :class="areaBase === item ? 'act' : ''"
-          v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+
           class="brand-item margin-notAll"
           v-for="(item,index) in areaBases"
           :key="item"

src/SManagement/archives_sc/index.vue

@@ -15,7 +15,7 @@
             <div class="bottom">
               <p class="title">{{$t(item.title)}}</p>
               <p class="descript">{{$t(item.notes)}}</p>
-              <p class="people">{{item.studypeoplecount}}' '{{$t('人学习')}}</p>
+              <p class="people">{{item.studypeoplecount+ ' ' }}{{$t('人学习')}}</p>
             </div>
           </div>
         </div>

src/WebsiteManagement/dataStatistics/modules/statisticalAnalysisOfMessage.vue

@@ -62,7 +62,7 @@ export default {
       tablecols: [],
       content: {
         pageSize: 10,
-        pageNumbe: 1,
+        pageNumber: 1,
         total: 0,
         where: {},
         nocache: true,
@@ -101,7 +101,7 @@ export default {
           if (res.code != 1) return;
           this.list = res.data;
           this.content.total = res.total;
-          this.content.pageNumbe = res.pageNumber;
+          this.content.pageNumber = res.pageNumber;
           this.content.pageSize = res.pageSize;
         });
     },
@@ -110,7 +110,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(pageNumbe) {
-      this.content.pageNumbe = pageNumbe;
+      this.content.pageNumber = pageNumbe;
       this.getList();
     },
   },
@@ -133,4 +133,4 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
-</style>
+</style>

src/template/orderAddCanUseAgent/index.vue

@@ -6,7 +6,8 @@
       v-model="visible">
       <div>
         <div class="flex-align-center flex-between" style="margin-bottom:10px">
-          <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" :placeholder="$t(`输入企业信息`)" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input style="width:200px;" :placeholder="$t('输入企业信息')" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
           <addTemp @onSuccess="onSuccess"></addTemp>
         </div>
         <el-table
@@ -117,5 +118,9 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
 </style>

src/template/selectSaler/index.vue

@@ -25,30 +25,50 @@
             :label="$t('姓名')"
             width="100">
           </el-table-column>
+          <el-table-column
+              prop="depfullname"
+              :label="$t('部门')"
+
+              >
+          </el-table-column>
           <el-table-column
             prop="position"
             :label="$t('职位')"
             width="120">
           </el-table-column>
           <el-table-column
+              v-if="isPlain"
               prop="areaname"
               :label="$t(`负责区域`)"
-              width="0">
-<!--            <template slot-scope="scope">-->
-<!--              <span v-if="scope.row.salearea">-->
-<!--                <span v-for="(item,index) in scope.row.salearea" :key="index">-->
-<!--                  {{index === scope.row.salearea.length -1?item.areafullname:item.areafullname + '，'}}-->
-<!--                </span>-->
-<!--              </span>-->
-<!--              <span v-else>-->
-<!--                {{'&#45;&#45;'}}-->
-<!--              </span>-->
-<!--            </template>-->
+              width="150">
+            <template slot-scope="scope">
+              <span v-if="scope.row.salearea">
+                <span v-for="(item,index) in scope.row.salearea" :key="index">
+                  {{index === scope.row.salearea.length -1?item.areaname:item.areaname + '，'}}
+                </span>
+              </span>
+              <span v-else>
+                {{'--'}}
+              </span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="userphonenumber"
+            prop="phonenumber"
+            v-if="isPlain"
             :label="$t(`手机号码`)"
-            width="150">
+            width="110">
+          </el-table-column>
+          <el-table-column
+              prop="areaname"
+              v-if="!isPlain"
+              :label="$t(`负责区域`)"
+              width="150">
+          </el-table-column>
+          <el-table-column
+              prop="userphonenumber"
+              v-if="!isPlain"
+              :label="$t(`手机号码`)"
+              width="110">
           </el-table-column>
           <el-table-column
             :label="$t('操作')"
@@ -77,7 +97,7 @@
 
 <script>
 export default {
-  props:['customParam'],
+  props:['customParam','isPlain'],
   data () {
     return {
       visible:false,