Merge branch 'blueBranch' into allTestUrgent

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/template/selectSaler/index.vue

@@ -28,7 +28,8 @@
           <el-table-column
               prop="depfullname"
               :label="$t('部门')"
-              width="120">
+
+              >
           </el-table-column>
           <el-table-column
             prop="position"
@@ -39,7 +40,7 @@
               v-if="isPlain"
               prop="areaname"
               :label="$t(`负责区域`)"
-              width="0">
+              width="150">
             <template slot-scope="scope">
               <span v-if="scope.row.salearea">
                 <span v-for="(item,index) in scope.row.salearea" :key="index">
@@ -55,19 +56,19 @@
             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="0">
+              width="150">
           </el-table-column>
           <el-table-column
               prop="userphonenumber"
               v-if="!isPlain"
               :label="$t(`手机号码`)"
-              width="150">
+              width="110">
           </el-table-column>
           <el-table-column
             :label="$t('操作')"