Merge branch 'greenUrgent' into testToMerge

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

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

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/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('已取消删除')
         });
       });
     },