Merge branch 'redUrgent' into testToMerge

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :gutter="20">
-      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <borderTemp>
           <template #content>
             <el-row>
@@ -12,37 +12,49 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4" class="titleHover" >
+              <el-col :span="3" class="titleHover" >
                 <div @click="onClick('新增线索','周',2)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bzxsxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div  @click="onClick('跟进线索','周',2)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bzxsgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增客户','周',2)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bzkhxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('客户跟进','周',2)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bzkhgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`新增联系人`)}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bzlxxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`联系人跟进`)}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bzlxgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增项目','周',2)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.bzxmxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('项目跟进','周',2)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.bzxmgj}}</div>
@@ -52,7 +64,7 @@
           </template>
         </borderTemp>
       </el-col>
-      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <borderTemp>
           <template #content>
             <el-row>
@@ -63,37 +75,49 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增线索','月',3)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.byxsxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div  @click="onClick('跟进线索','月',3)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.byxsgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增客户','月',3)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bykhxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('客户跟进','月',3)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bykhgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`新增联系人`)}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bylxxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`联系人跟进`)}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bylxgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" class="titleHover">
                 <div  @click="onClick('新增项目','月',3)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.byxmxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('项目跟进','月',3)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.byxmgj}}</div>
@@ -103,7 +127,7 @@
           </template>
         </borderTemp>
       </el-col>
-      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <borderTemp>
           <template #content>
             <el-row>
@@ -114,37 +138,49 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增线索','上月',5)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.syxsxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div  @click="onClick('跟进线索','上月',5)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.syxsgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增客户','上月',5)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.sykhxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('客户跟进','上月',5)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.sykhgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3">
+                <div>
+                  <div>{{$t(`新增联系人`)}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.sylxxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`联系人跟进`)}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.sylxgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" class="titleHover">
                 <div  @click="onClick('新增项目','上月',5)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.syxmxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('项目跟进','上月',5)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.syxmgj}}</div>
@@ -154,7 +190,7 @@
           </template>
         </borderTemp>
       </el-col>
-      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <borderTemp>
           <template #content>
             <el-row>
@@ -165,37 +201,49 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增线索','年',4)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bnxsxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('跟进线索','年',4)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增客户','年',4)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bnkhxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('客户跟进','年',4)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`新增联系人`)}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bnlxxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" >
+                <div>
+                  <div>{{$t(`联系人跟进`)}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bnlxgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('新增项目','年',4)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.bnxmxz}}</div>
                 </div>
               </el-col>
-              <el-col :span="4" class="titleHover">
+              <el-col :span="3" class="titleHover">
                 <div @click="onClick('项目跟进','年',4)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.bnxmgj}}</div>

src/HDrpManagement/dispatch/details/index.vue

@@ -20,7 +20,24 @@
 <!--        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" content="是否确定提交发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>-->
         <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 type="primary" v-if="tool.checkAuth($route.name,'verificationCheck') && (mainData.status == '新建' || mainData.status == '提交')" size="mini" @click="onVerificationCheck"  class="inline-16" >{{$t('校验审核')}}</el-button>
+        <el-button style="margin-left: 0px" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '审核' && mainData.status !== '复核' && mainData.status !== '关闭'"  @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
+        <dialogTemplateNew ref="dialogTemplateNew" class="inline-16" v-if="tool.checkAuth($route.name,'check') && mainData.status == '审核'" btnTitle="反审核" btnType="primary" content="确定反审核该发货单" @onCancel="form.uncheckreason = ''" @onSubmit="onSubmit">
+          <template slot="formRule">
+            <el-form :model="form" :rules="rules" ref="form" size="mini">
+              <el-col :span="24">
+                <el-form-item :label="$t('反审原因')" prop="uncheckreason">
+                  <el-input
+                      v-model="form.uncheckreason"
+                      type="textarea"
+                      :rows="5"
+                      :placeholder="$t('请输入反审原因')"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </template>
+        </dialogTemplateNew>
         <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="primary" v-if="(mainData.status == '审核' || mainData.status == '复核') && tool.checkAuth($route.name,'close')" size="mini" @click="onClose" style="margin-left: 0px" class="inline-16" >{{$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>
@@ -44,6 +61,7 @@ import productList from '../modules/productlist.vue'
 import erpInfo from '../modules/erpInfo.vue'
 import defaultInfo from '../modules/defaultInfo.vue'
 import dialogTemplate from "@/components/dialogTemplate/index";
+import dialogTemplateNew from '@/components/dialogTemplate/index1'
   export default {
     name: "detail",
     data() {
@@ -51,7 +69,19 @@ import dialogTemplate from "@/components/dialogTemplate/index";
         mainData:{},
         mainAreaData:{},
         dispatch_recheck:'',
-        siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+        siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
+        form:{
+          uncheckreason:''
+        },
+        rules: {
+          uncheckreason: [
+            {
+              required: true,
+              message: this.$t("请输入反审原因"),
+              trigger: "blur",
+            },
+          ],
+        },
       }
     },
     components:{
@@ -59,7 +89,8 @@ import dialogTemplate from "@/components/dialogTemplate/index";
       productList,
       defaultInfo,
       erpInfo,
-      dialogTemplate
+      dialogTemplate,
+      dialogTemplateNew
     },
     methods:{
       async queryMainData(id) {
@@ -162,6 +193,21 @@ import dialogTemplate from "@/components/dialogTemplate/index";
 
         this.$emit('onSuccess')
       },
+      onSubmit(){
+        this.$refs.form.validate(async (valid) => {
+          if (!valid) return false
+          const res = await this.$api.requested({
+            "id": 20221114135703,
+            "content": {
+              "sa_dispatchid": this.$route.query.id,
+              "uncheckreason":this.form.uncheckreason
+            },
+          })
+          this.tool.showMessage(res,()=>{
+            this.queryMainData()
+          })
+        })
+      },
       onCheck () {
         if (this.mainData.status == '审核'){
           this.$prompt(this.$t('反审核原因'), this.$t('确定反审核该发货单吗？'), {
@@ -277,6 +323,17 @@ import dialogTemplate from "@/components/dialogTemplate/index";
         });
 
       },
+      async onVerificationCheck(){
+        const res = await this.$api.requested({
+          "id": 2025071615130202,
+          "content": {
+            "sa_dispatchid":this.$route.query.id
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.queryMainData()
+        })
+      },
       async onClose(){
         const res = await this.$api.requested({
           "id": 2025070114184202,

src/HManagement/siteManage/tagManage/index.vue

@@ -63,6 +63,17 @@
           </span>
           <span v-else>--</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'isenable'">
+          <el-switch
+              v-if="scope.data.column.data.issystem == 1"
+              v-model="scope.data.column.data[scope.data.column.columnname]"
+              @change="isenableChange(scope.data.column.data[scope.data.column.columnname],scope.data.column.data.rowindex,scope.data.column.data.sys_systemtagdetailid)"
+              :active-value="1"
+              :inactive-value="0"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+          </el-switch>
+        </div>
         <div v-else>
           {{ $t(scope.data.column.data[scope.data.column.columnname]) }}
         </div>
@@ -161,6 +172,37 @@ export default {
       this.selectTarget = this.objectList[0].sys_systemtagid;
       console.log(this.objectList);
     },
+    isenableChange(val,index,id){
+      console.log(val)
+      let message = ''
+      if (val == 1){
+        message = '确定开启该系统标签，执行系统标签程序？'
+      }else {
+        message = '确定关闭该系统标签，不再执行系统标签程序？'
+      }
+      this.$confirm(this.$t(message), this.$t('提示'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": 2025071714190802,
+          "content": {
+            "sys_systemtagdetailid": id,
+            "isenable": val
+          },
+        })
+        if (res.code == 0){
+          this.tool.showMessage(res,()=>{})
+        }
+      }).catch(() => {
+        if (val == 1){
+          this.$refs.basicLayout.list[index -1].isenable = 0
+        }else {
+          this.$refs.basicLayout.list[index -1].isenable = 1
+        }
+      });
+    }
   },
 };
 </script>

src/WebsiteManagement/consultManage/modules/add.vue

@@ -238,7 +238,7 @@ export default {
         });
       });
     },
-    async onCancel() {
+    async tonCancel() {
       if (!this.isSave) {
         const res = await this.$api.requested({
           id: "20240727135803",

src/components/dialogTemplate/index1.vue

@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <el-button :type="disabled?'':btnType" size="mini" :disabled="disabled"  @click="dialogShow">{{$t(btnTitle)}}</el-button>
+    <el-dialog :title="$t(`提示`)" :visible.sync="dialogTableVisible" append-to-body :show-close="false" width="600px">
+      <div style="margin-bottom: 20px"><i class="el-icon-warning" style="color: #eda51c;margin-right: 10px"></i>{{$t(content) + '?'}}</div>
+      <slot name="formRule"></slot>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onCancel" size="small">{{$t(`取 消`)}}</el-button>
+        <el-button type="primary" @click="onSubmit" size="small">{{$t(`确 定`)}}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index1",
+  props:["btnTitle","disabled","btnType","content"],
+  data(){
+    return {
+      dialogTableVisible:false,
+    }
+  },
+  methods:{
+    dialogShow(){
+      this.dialogTableVisible = true
+    },
+    onCancel(){
+      this.dialogTableVisible = false
+      this.$emit('onCancel')
+    },
+    onSubmit(){
+      this.$emit('onSubmit')
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding: 0 20px 20px 20px !important;
+  }
+</style>