Merge branch 'mergeBranch' into redUrgent

src/Form/marketing2/saler/edit.vue

@@ -106,7 +106,7 @@ export default {
       this.form.discountrate = Math.round((this.form.discountrate*100)*100)/100
       this.$nextTick(() => {
         console.log(this.$refs)
-        this.$refs.salerName.value.name = this.data.name
+        this.$refs.selectMenber.value.name = this.data.name
       });
 
     },
@@ -121,7 +121,7 @@ export default {
         "discountrate":''
       }
     },
-    selectMenbers (data) {
+    selectMenber (data) {
       console.log(data)
       this.form = Object.assign({},this.form,data)
     },

src/Form/projectChange/add.vue

@@ -330,7 +330,7 @@
                 <el-input
                   v-model="form.signamount_due"
                   :placeholder="$t('请输入预计签约金额')"
-                  disabled
+                  :disabled="siteid == 'HY'"
                 ></el-input>
               </el-form-item>
             </el-col>

src/Form/projectChange/edit.vue

@@ -45,6 +45,7 @@
                   v-model="form.projectname"
                   :placeholder="$t('请输入项目名称')"
                   @blur="nameChange((param.content.pageNumber = 1))"
+                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
                 ></el-input>
                 <span
                   style="color: red; font-size: 12px; margin-bottom: -10px"
@@ -157,6 +158,7 @@
                   :options="basicData.data().areaData"
                   @change="cascaderChange"
                   clearable
+                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
                 >
                 </el-cascader>
               </el-form-item>
@@ -175,6 +177,7 @@
                 <el-input
                   v-model="form.address"
                   :placeholder="$t('请输入详细地址')"
+                  :disabled="clueList.length > 0"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -183,6 +186,7 @@
                 <el-input
                   v-model="form.address"
                   :placeholder="$t('请输入详细地址')"
+                  :disabled="(siteid == 'YOSTEST1' && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -343,7 +347,7 @@
                 <el-input
                   v-model="form.signamount_due"
                   :placeholder="$t('请输入预计签约金额')"
-                  disabled
+                  :disabled="siteid == 'HY'"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -695,6 +699,7 @@ export default {
           },
         ],
       },
+      clueList:[]
     };
   },
   computed: {
@@ -739,15 +744,11 @@ export default {
       this.getSysetms();
       this.queryBrand();
       this.queryTradefield();
+      this.clueData()
       this.siteid = JSON.parse(sessionStorage.getItem("active_account")).siteid;
       const res = await this.$store.dispatch("optiontypeselect", "squarestage");
       this.squarestages = res.data;
-      /*this.form.tradefields = JSON.parse(this.form.tradefields)*/
 
-      /*this.form.budgetary = this.form.budgetary !== 0 ? this.tool.formatAmount(this.form.budgetary,2):'' || ''
-      this.form.totalinvestment  ? this.form.totalinvestment = this.tool.formatAmount(this.form.totalinvestment,2):this.form.totalinvestment = ''
-      this.form.costofconstruction  ? this.form.costofconstruction = this.tool.formatAmount(this.form.costofconstruction,2):this.form.costofconstruction = ''
-      this.form.signamount_due  ? this.form.signamount_due = this.tool.formatAmount(this.form.signamount_due,2):this.form.signamount_due = ''*/
     },
     /*查重检查*/
     onCheck() {
@@ -996,6 +997,23 @@ export default {
       let res2 = await this.$store.dispatch("optiontypeselect", "projectgrade");
       this.projectLead = res2.data;
     },
+    /*获取关联线索数据*/
+    async clueData(){
+      let param = {
+        "id": 20221124110002,
+        "content": {
+          "nocache": true,
+          "pageNumber": 1,
+          "pageSize":20,
+          "sa_projectid":this.$route.query.id,
+          "where": {
+            "condition": ""
+          }
+        }
+      }
+      const res = await this.$api.requested(param)
+      this.clueList = res.data
+    }
   },
   mounted() {},
   created() {

src/HDrpManagement/ProductMag/index.vue

@@ -138,6 +138,7 @@
             </el-option>
           </el-select>
         </div>
+        <selectTemplate title="供应方" payload="supplier" @onChange="onChange"></selectTemplate>
       </template>
       <template v-slot:tbList="scope">
         <div>
@@ -217,6 +218,7 @@ import importImage from './modules/importImage.vue'
 import importInfo from './modules/importInfo.vue'
 import commissionSchemeSet from "@/HDrpManagement/ProductMag/modules/components/commissionSchemeSet";
 import setFieldCommission from './modules/components/setFieldCommission'
+import selectTemplate from '@/components/generalTemplate/select'
 import { Loading } from 'element-ui';
 
 export default {
@@ -251,7 +253,8 @@ export default {
         model:'',
         spec:'',
         tradefield:'',
-        categories:''
+        categories:'',
+        supplier:''
       },
       rowData:[],
       tradefieldData:[],
@@ -273,7 +276,8 @@ export default {
     batchUp,
     batchDown,
     commissionSchemeSet,
-    setFieldCommission
+    setFieldCommission,
+    selectTemplate
   },
   methods:{
     async isOnSaleChange(val){
@@ -414,6 +418,10 @@ export default {
     listData(){
       this.$refs.basicLayout.param.content.where = this.selectParam
       this.$refs.basicLayout.listData()
+    },
+    onChange(data,type){
+      this.selectParam[type] = data
+      this.selectChange()
     }
   },
   mounted() {

src/HManagement/clueManage/m_activity/modules/details.vue

@@ -20,8 +20,10 @@
       <div slot="customOperation">
         <relase class="inline-16" v-if="tool.checkAuth($route.name,'relase') && mainData.status != '结束'" :data="mainData" @onSuccess="queryMainData"></relase>
         <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status != '结束' && mainData.status != '新建'" :data="mainData" @onSuccess="queryMainData"></finish>
-        <el-button size="mini" :disabled="mainData.ordercluecount > 0"  :type="mainData.ordercluecount === 0?'primary':''" @click="onDel" v-if="tool.checkAuth($route.name,'onDelete')  && mainData.status != '发布' && mainData.status != '结束' && mainData.disabled">{{$t('删 除')}}</el-button>
+        <el-button class="inline-16" size="mini" :disabled="mainData.ordercluecount > 0"  :type="mainData.ordercluecount === 0?'primary':''" @click="onDel" v-if="tool.checkAuth($route.name,'onDelete')  && mainData.status != '发布' && mainData.status != '结束' && mainData.disabled">{{$t('删 除')}}</el-button>
         <el-button size="mini" class="inline-16" type="primary" @click="onDeManage" v-if="tool.checkAuth($route.name,'deleteManage')">{{$t('删除(管理)')}}</el-button>
+        <btnClick class="inline-16" v-if="mainData.status != '结束' && tool.checkAuth($route.name, 'endManage')" btnTitle="结束(管理)" message="确定结束该活动吗？" nameId="2025091115541002"
+                  nameKey="sat_campaignids" :id="$route.query.id" btnType="primary" @deleteSuccess="queryMainData" infoMessage="已取消结束"></btnClick>
       </div>
       <div slot="slot0" class="container normal-panel">
         <DetailTable ref="DetailTable">
@@ -46,6 +48,7 @@ import finish from './finish.vue'
 
 import addClue from './addClue'
 import editClue from './editClue'
+import btnClick from '@/components/btn-delete/index'
 export default {
   name: "detail",
   data() {
@@ -111,7 +114,8 @@ export default {
     relase,
     finish,
     addClue,
-    editClue
+    editClue,
+    btnClick
   },
   methods:{
     async queryMainData(id) {

src/HManagement/department/index.vue

@@ -81,6 +81,13 @@
             @change="selectChange"
             >{{$t('业务员')}}</el-checkbox
           >
+          <el-checkbox
+              v-model="type"
+              :false-label="null"
+              :true-label="1"
+              @change="selectChange"
+          >{{$t('兼职')}}</el-checkbox
+          >
         </div>
         <template v-slot:tbList="scope">
           <div>
@@ -112,6 +119,9 @@
                 }}</span
               >
             </p>
+            <p v-else-if="scope.data.column.columnname === 'type'">
+              {{ scope.data.column.data.type == "0" ? $t("正式") : $t("兼职") }}
+            </p>
             <p v-else>
               {{
                 scope.data.column.data[[scope.data.column.columnname]]
@@ -148,6 +158,7 @@ export default {
       selectResult: 1,
       issale: 0,
       status: "0",
+      type:'0'
     };
   },
   methods: {
@@ -172,6 +183,7 @@ export default {
       this.$refs.basicLayout.param.content.containssub = this.selectResult;
       this.$refs.basicLayout.param.content.where.issale = this.issale;
       this.$refs.basicLayout.param.content.where.status = this.status;
+      this.$refs.basicLayout.param.content.where.type = this.type
       this.$refs.basicLayout.param.content.pageNumber = 1;
       this.$refs["basicLayout"].listData();
     },

src/HManagement/department/staff/detail/index.vue

@@ -132,6 +132,10 @@ export default {
           label:'是否业务员',
           value:this.mainData.issalehr === 1?this.$t('是'):this.$t('否')
         },
+        {
+          label:'员工属性',
+          value:this.mainData.type === 1?this.$t('兼职'):this.$t('正式')
+        },
         /*{
           label:this.$t('电话')'报备领域',
           value:this.mainData.tradefield

src/HManagement/department/staff/detail/modules/main.vue

@@ -42,6 +42,7 @@
             --
           </div>
         </el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`员工属性`)">{{mainInfo.type == 1?$t('兼职'):$t('正式')}}</el-descriptions-item>
       </el-descriptions>
     </div>
     <div class="">

src/HManagement/department/staff/list/modules/add.vue

@@ -77,7 +77,7 @@
                 <selectMenber @selectMenber="selectMenber" @clearMenber="form.reporthrname = '';form.reporthrid = ''"></selectMenber>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="12" >
               <el-form-item :label="$t(`状态`)+':'">
                 <el-radio-group v-model="form.status">
                   <el-radio :label="0">{{ $t('在职') }}</el-radio>
@@ -85,6 +85,14 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="12" >
+              <el-form-item :label="$t(`员工属性`)+':'">
+                <el-radio-group v-model="form.type">
+                  <el-radio :label="0">{{ $t('正式') }}</el-radio>
+                  <el-radio :label="1">{{ $t('兼职') }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col  :span="5" style="height:51px">
@@ -227,7 +235,8 @@ export default {
         'areaname':'',
         'issalehr':'0',
         'tradefield':'',
-        "salearea": []
+        "salearea": [],
+        "type":0
       },
       value:[],
       drawer:false,
@@ -353,7 +362,8 @@ export default {
         "userid":"0",
         "isworker":'0',
         "isuppictured":'0',
-        "issalehr":'0'
+        "issalehr":'0',
+        "type":0
       }
     },
     // 监听汇报对象选择

src/HManagement/department/staff/list/modules/edit.vue

@@ -77,7 +77,7 @@
                 <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"  @clearMenber="form.reporthrname = '';form.reporthrid = ''"></selectMenber>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="12" >
               <el-form-item :label="$t(`状态`)+':'">
                 <el-radio-group v-model="form.status">
                   <el-radio label="0">{{ $t('在职') }}</el-radio>
@@ -85,6 +85,14 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="12" >
+              <el-form-item :label="$t(`员工属性`)+':'">
+                <el-radio-group v-model="form.type">
+                  <el-radio :label="0">{{ $t('正式') }}</el-radio>
+                  <el-radio :label="1">{{ $t('兼职') }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col  :span="5" style="height:51px">

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

@@ -149,7 +149,11 @@ export default {
         {
           label:'最低授权折扣(%)',
           value:Math.round((this.mainData.discountrate*100)*100)/100
-        }
+        },
+        {
+          label:'员工属性',
+          value:this.mainData.type === 1?this.$t('兼职'):this.$t('正式')
+        },
       ]
     },
   },

src/HManagement/marketing2/saler/area/detail/modules/detailedData.vue

@@ -13,6 +13,7 @@
         <el-descriptions-item :label="$t(`汇报对象`)">{{ detailData.reporthrname?detailData.reporthrname:"--" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`是否可编辑订单价格`)">{{ detailData.iseditprice == '1'?"是":"否" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`最低授权折扣(%)`)" >{{ detailData.discountrate?Math.round((detailData.discountrate*100)*100)/100:"--" }}</el-descriptions-item>
+        <el-descriptions-item :label="$t(`员工属性`)">{{detailData.type == 1?$t('兼职'):$t('正式')}}</el-descriptions-item>
       </el-descriptions>
     </div>
 

src/HManagement/marketing2/saler/index.vue

@@ -15,7 +15,15 @@
         :detailPath="{
           path:'/saler_detail',param:{portrait:''}
         }">
-        <div slot="custom"></div>
+        <div slot="custom-right">
+          <el-checkbox
+              v-model="type"
+              :false-label="null"
+              :true-label="1"
+              @change="selectChange"
+          >{{$t('兼职')}}</el-checkbox
+          >
+        </div>
         <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname === 'discountrate'">
             {{Math.round((scope.data.column.data.discountrate*100)*100)/100}}
@@ -23,6 +31,9 @@
           <div v-else-if="scope.data.column.columnname === 'iseditprice'">
             {{scope.data.column.data[[scope.data.column.columnname]] == '1'?$t('是'):$t('否')}}
           </div>
+          <div v-else-if="scope.data.column.columnname === 'type'">
+            {{scope.data.column.data[[scope.data.column.columnname]] == '1'?$t('兼职'):$t('正式')}}
+          </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]?$t(scope.data.column.data[[scope.data.column.columnname]]):'--'}}
           </div>
@@ -50,7 +61,8 @@ export default {
   data () {
     return {
       options:[],
-      areaInfo:{}
+      areaInfo:{},
+      type:0
     }
   },
   methods:{
@@ -75,7 +87,12 @@ export default {
     },
     onStartArea (status) {
       status === 1?this.areaInfo.isused = 0:this.areaInfo.isused = 1
-    }
+    },
+    selectChange() {
+      this.$refs.basicLayout.param.content.where.type = this.type
+      this.$refs.basicLayout.param.content.pageNumber = 1;
+      this.$refs["basicLayout"].listData();
+    },
   }
 }
 

src/HManagement/siteManage/securityConfig/index.vue

@@ -85,7 +85,7 @@
             </p>
           </div>
         </div>
-        <customerCheckRule  @queryRule="queryRule"></customerCheckRule>
+        <customerCheckRule  @queryRule="queryRule" ></customerCheckRule>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">
@@ -124,7 +124,7 @@
             </div>
           </div>
         </div>
-        <projectCheckRule   @queryRule="queryRule"></projectCheckRule>
+        <projectCheckRule @queryRule="queryRule();querySite_Parameter()" :setNumber="projectrepeatnum"></projectCheckRule>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">
@@ -355,7 +355,8 @@ export default {
       querysaledata:'',
       queryhistoryproject:'',
       projectnameexcludefields:[],
-      isitemclass:''
+      isitemclass:'',
+      projectrepeatnum:''
     }
   },
   computed:{
@@ -401,6 +402,7 @@ export default {
       this.queryhistoryproject = res.data.queryhistoryproject
       this.isitemclass = res.data.isitemclass
       console.log(res.data,'数据2');
+      this.projectrepeatnum = res.data.projectrepeatnum
       this.setData = res.data
       this.$refs.messageTips.form = Object.assign({},this.$refs.messageTips.form,res.data)
       this.$refs.changeSite.form = Object.assign({},this.$refs.changeSite.form,res.data)

src/HManagement/siteManage/securityConfig/modules/projectCheckRule.vue

@@ -9,10 +9,22 @@
         <el-col :span="24" style="margin-top: 20px">
           <div>
             <span style="margin-right: 10px">{{$t(`项目名称查重排除文字`)}}:</span>
+            <el-tooltip placement="top" style="margin-right: 10px">
+              <div slot="content">{{$t('项目名称查重排除文字，是项目名称查重前提条件之一，设置的文字，是项目名称查重时需排除掉的文字。')}}<br>{{$t('项目名称查重需先排除设置文字后，再将名称剩下的文字进行查重。')}}</div>
+              <img style="vertical-align: middle" width="14px" height="14px" src="../../../../assets/icons/prompt_icon.svg" >
+            </el-tooltip>
             <el-tag v-for="(item,index) in projectnameexcludefields" :key="index" style="margin-right: 10px" class="mt-10" closable @close="tagDel(item,index)">{{item}}</el-tag>
             <el-button type="primary" size="mini" @click="setWordVisible = true">{{$t(`添加`)}}</el-button>
           </div>
         </el-col>
+        <el-col :span="24" style="margin-top: 20px">
+          <span style="margin-right: 10px">{{$t(`查重字符数`)}}:</span>
+          <el-input v-model="projectrepeatnum" style="width: 200px;margin-right: 10px" :placeholder="$t(`设置查重字符数`)" size="small"></el-input>
+          <el-tooltip placement="top">
+            <div slot="content">{{$t('查重字符数，是项目名称查重判断依据之一，项目名称排除设置文字后，剩下的文字进行项目名称查重，若重复的文字 ≥ 查重字符数，则判断该项目名称重复。')}}</div>
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../../assets/icons/prompt_icon.svg" >
+          </el-tooltip>
+        </el-col>
         <el-col :span="24" style="margin-top: 20px">
           <div style="width: 50px" class="inline-16">
             {{ $t('第一层') }}:
@@ -149,6 +161,7 @@
 <script>
 export default {
   name: "customerCheckRule",
+  props:['setNumber'],
   data(){
     return {
       dialogEditVisible:false,
@@ -228,12 +241,15 @@ export default {
       relation:'',
       exclude:'',
       projectnameexcludefields:[],
+      projectrepeatnum:0
     }
   },
   methods:{
     querySite_Parameter(){
       this.dialogEditVisible = true
       this.relation = this.relations[0].value
+      console.log(this.setNumber,'setNumber')
+      this.projectrepeatnum = this.setNumber
       this.queryTable()
       this.queryRule()
     },
@@ -265,17 +281,28 @@ export default {
             "factor3": this.factor3
           },
           "projectprotectionperiod":this.projectprotectionperiod,
-          "projectnameexcludefields":this.projectnameexcludefields
+          "projectnameexcludefields":this.projectnameexcludefields,
         },
       })
-      this.tool.showMessage(res,()=>{
-        this.$emit('queryRule')
-        this.dialogEditVisible = false
-        this.fields1 = []
-        this.fields2 = []
-        this.fields3 = []
-        this.projectprotectionperiod = 0
-      })
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{})
+      }else {
+        const res1 = await this.$api.requested({
+          "classname": "webmanage.site.site",
+          "method":"updateSite_Parameter",
+          "content": {
+            "projectrepeatnum":Number(this.projectrepeatnum)
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('queryRule')
+          this.dialogEditVisible = false
+          this.fields1 = []
+          this.fields2 = []
+          this.fields3 = []
+          this.projectprotectionperiod = 0
+        })
+      }
     },
     onClose(){
       this.dialogEditVisible = false

src/HManagement/siteManage/tagManage/components/edit.vue

@@ -77,7 +77,6 @@ export default {
         this.form.sys_systemtagid = this.sys_systemtagid()
         const res = await this.$api.requested({
           "id": "20221013104501",
-          "version":1,
           "content": this.form
         })
         this.tool.showMessage(res,async()=>{
@@ -86,16 +85,16 @@ export default {
               "sys_systemtagdetailid": item,
             }
           })
-          if (mutextags.length > 0) {
-            let res2 = await this.$api.requested({
-              "id":20221014122501,
-              "content": {
-                "sys_systemtagid": res.data.sys_systemtagid,
-                "sys_systemtagdetailid": res.data.sys_systemtagdetailid,
-                "mutextags": mutextags,
-              }
-            })
-          }
+
+          let res2 = await this.$api.requested({
+            "id":20221014122501,
+            "content": {
+              "sys_systemtagid": res.data.sys_systemtagid,
+              "sys_systemtagdetailid": res.data.sys_systemtagdetailid,
+              "mutextags": mutextags,
+            }
+          })
+
           this.dialogFormVisible = false
           this.$refs['form'].resetFields();
           this.$emit('onSuccess')

src/HManagement/task/index.vue

@@ -92,6 +92,10 @@ export default {
           label:'已完成',
           value:3
         },
+        {
+          label:'已结束',
+          value:4
+        },
       ],
       status:'',
       pathData:[]

src/HManagement/task/modules/detail.vue

@@ -20,7 +20,7 @@
         <complete-task
           :data="mainData"
           class="inline-16"
-          v-if="tool.checkAuth($route.name, 'complete') && mainData.disabled"
+          v-if="tool.checkAuth($route.name, 'complete') && mainData.disabled && mainData.status != '已结束'"
           style="display: inline"
           @onSuccess="queryMainData()"
         ></complete-task>
@@ -28,6 +28,7 @@
           v-if="tool.checkAuth($route.name, 'delete') && nowUserid === mainData.createuserid"
           type="primary"
           size="mini"
+          class="inline-16"
           @click="deleteTask"
           >{{ $t("删 除") }}</el-button
         >
@@ -39,6 +40,8 @@
             @click="deleteTaskManage"
         >{{ $t("删除(管理)") }}</el-button
         >
+        <btnClick class="inline-16" v-if="mainData.status != '已完成' && mainData.status != '已结束' && tool.checkAuth($route.name, 'endManage')" btnTitle="结束(管理)" message="确定结束该任务吗？" nameId="2025091116074602" :isNumber="true"
+                  nameKey="sys_taskid" :id="$route.query.id" btnType="primary" @deleteSuccess="queryMainData" infoMessage="已取消结束"></btnClick>
       </div>
       <div slot="slot0">
         <!--        <p class="mt-10">标题:{{mainData.title}}</p>
@@ -235,6 +238,7 @@
 import { mapGetters } from "vuex";
 
 import completeTask from "./completeTask.vue";
+import btnClick from '@/components/btn-delete/index'
 export default {
   name: "detail",
   data() {
@@ -255,7 +259,7 @@ export default {
     }),
   },
   components: {
-    completeTask,
+    completeTask,btnClick
   },
   methods: {
     async queryMainData(id) {

src/components/btn-delete/index.vue

@@ -7,7 +7,7 @@
 <script>
 export default {
   name: "index",
-  props:['btnType','btnTitle','message','confirmButtonText','cancelButtonText','isNumber','nameId','nameKey','id'],
+  props:['btnType','btnTitle','message','confirmButtonText','cancelButtonText','isNumber','nameId','nameKey','id','infoMessage'],
   data() {
     return {
       param: {
@@ -30,7 +30,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: this.$t('已取消删除')
+          message: this.infoMessage?this.$t(this.infoMessage):this.$t('已取消删除')
         });
       });
     },

src/components/generalTemplate/select.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <label  class="search__label" >{{title}}:</label>
+    <el-select class="inline-24" v-model="selectData" :placeholder="placeholder" @change="selectChange" size="small" clearable @focus="onFocus">
+      <el-option
+          v-for="item in list"
+          :key="item.value"
+          :label="$t(item.value)"
+          :value="item.value">
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "select",
+  props:{
+    title:String,
+    placeholder:String,
+    payload:String
+  },
+  data(){
+    return {
+      list:[],
+      selectData:''
+    }
+  },
+  methods:{
+    selectChange(){
+      this.$emit(`onChange`,this.selectData,this.payload)
+    },
+    onFocus(){
+      if (this.list.length == 0){
+        this.listData()
+      }
+    },
+    async listData(){
+      const res = await this.$store.dispatch('optiontypeselect',this.payload)
+      this.list = res.data
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/salesData/components/boxLine.vue

@@ -355,6 +355,13 @@
               </el-option>
             </el-select>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">{{$t('状态')}}:</p>
+            <el-select v-model="paramDetail.content.where.isleave" clearable style="margin-right:10px" size="small" :placeholder="$t('请选择状态')" disabled >
+              <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">
             <span class="search__label" >{{$t('订单类型')}}:</span>
             <el-select class="inline-16" v-model="orderType" filterable :placeholder="$t('请选择')" size="small" clearable   @change="selectOrderType" >
@@ -417,6 +424,9 @@
             <div v-else-if="scope.column.columnname === 'unwriteoffamount'">
               {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
             </div>
+            <div v-else-if="scope.column.columnname === 'taxincludedamount'">
+              {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
+            </div>
             <div v-else-if="scope.column.columnname === 'unlogisticsqty'">
               {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
             </div>
@@ -512,7 +522,8 @@ export default {
           "where": {
             "condition": "",
             "type": "",
-            "tradefield": ""
+            "tradefield": "",
+            "isleave": "",
           }
         }
       },
@@ -681,6 +692,7 @@ export default {
       this.paramDetail.content.dateType = this.param.content.dateType
       this.paramDetail.content.where.type = this.orderType
       this.paramDetail.content.where.tradefield = this.tradefield
+      this.paramDetail.content.where.isleave = this.param.content.where.isleave
       const res = await this.$api.requested(this.paramDetail)
       this.listInfo = res.data
       this.total = res.total

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -8,16 +8,13 @@
             <div class="title" style="float: left">{{$t(`出货趋势分析`)}}</div>
             <el-tooltip placement="top" style="vertical-align: middle">
               <div slot="content">
-                {{$t(`1、不包含备货数据：`)}}<br>&nbsp;
-                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
-                {{$t(`（1）月度准交的订单行数：回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>
-                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
-                {{$t(`2、包含备货数据：`)}}<br>&nbsp;
-                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
-                {{$t(`（1）月度准交的订单行数：①+②`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
-                {{$t(`①回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
-                {{$t(`②备货日期在当月，且在回复交期后一个工作日（包含）之前完全备货且未完全出货的订单行数；`)}}<br>
-                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
+                <p>{{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}</p>
+                <p>{{$t(`月度的总订单行数： 回复交期在当月的，有审核和关闭的订单行数。`)}}</p>
+                <p>{{$t(`1、不包含备货数据，月度准交的订单行数：`)}}</p>
+                <p>{{$t(`回复交期在当月，且出货日期在回复交期+一个工作日（包含）之前完全出货的订单行数；`)}}</p>
+                <p>{{$t(`2、包含备货数据，月度准交的订单行数：①+②`)}}</p>
+                <p>{{$t(`①回复交期在当月，且出货日期在回复交期+一个工作日（包含）之前完全出货的订单行数；`)}}</p>
+                <p>{{$t(`②回复交期在当月，且备货日期在回复交期（包含）之前完全备货且未完全出货的订单行数；`)}}</p>
               </div>
               <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
             </el-tooltip>