Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/ProductMag/modules/add.vue

@@ -423,6 +423,9 @@ export default {
         itemname: [
           { required: true, message: this.$t('请输入产品名称'), trigger: 'blur' },
         ],
+        model: [
+          { required: true, message: this.$t('输入产品型号'), trigger: 'blur' },
+        ],
         isauxunit: [
           { type: 'number', required: true, message: this.$t('辅助单位管理不可为空'), trigger: 'change' },
         ],

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -426,6 +426,9 @@ export default {
         itemname: [
           { required: true, message: this.$t('请输入输入产品名称'), trigger: 'blur' },
         ],
+        model: [
+          { required: true, message: this.$t('输入产品型号'), trigger: 'blur' },
+        ],
         isauxunit: [
           { type: 'number', required: true, message: this.$t('辅助单位管理不可为空'), trigger: 'change' },
         ],

src/HDrpManagement/servePeople/index.vue

@@ -23,7 +23,7 @@
         </div>
         <div v-else-if="scope.data.column.columnname == 'isleader'">
           {{
-            scope.data.column.data.isleader ? $t("服务主管") : $t("服务人员")
+            scope.data.column.data.isworkerleader ? $t("服务主管") : $t("服务人员")
           }}
         </div>
         <div v-else>
@@ -53,4 +53,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/serveWorkBill/modules/checkBill/index.vue

@@ -47,7 +47,7 @@
         <template v-slot:opreation="scope">
           <slot name="download" :data="scope.data"></slot>
           <edit class="inline-16" btnTitle="编辑" btnType="text" v-if="mainData.status == '进行中' && scope.data.status == '新建' && type != '隐藏'" :mainData="mainData" @onSuccess="listData" :list="list" :sa_workorderid="sa_workorderid"></edit>
-          <el-button type="text" size="mini" style="color: #67C23A" v-if="mainData.status == '进行中' &&  scope.data.status == '新建' && type != '隐藏'" @click="submitClick(scope.data)">提交</el-button>
+          <el-button type="text" size="mini" style="color: #67C23A" v-if="mainData.status == '进行中' &&  scope.data.status == '新建' && type != '隐藏'" @click="submitClick(scope.data)">{{$t(`提交`)}}</el-button>
           <!-- <printTable :data="scope.data">
 
           </printTable> -->

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

@@ -124,6 +124,10 @@ export default {
           label:'是否服务人员',
           value:this.mainData.isworker === 1?this.$t('是'):this.$t('否')
         },
+        {
+          label:'是否服务主管',
+          value:this.mainData.isworkerleader === 1?this.$t('是'):this.$t('否')
+        },
         {
           label:'是否上图员',
           value:this.mainData.isuppictured === 1?this.$t('是'):this.$t('否')

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

@@ -20,6 +20,7 @@
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`汇报对象`)">{{mainInfo.reporthrname?mainInfo.reporthrname:'--'}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`是否部门负责人`)">{{mainInfo.isleader == 1?$t('是'):$t('否')}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`是否服务人员`)">{{mainInfo.isworker == 1?$t('是'):$t('否')}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`是否服务主管`)">{{mainInfo.isworkerleader == 1?$t('是'):$t('否')}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`是否上图员`)">{{mainInfo.isuppictured == 1?$t('是'):$t('否')}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`是否业务员`)">{{mainInfo.issalehr == 1?$t('是'):$t('否')}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" :label="$t(`营销区域`)">

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

@@ -95,23 +95,29 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col  :span="5" style="height:51px">
+            <el-col  :span="4" style="height:51px">
               <el-form-item>
                 <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">{{ $t('是否部门负责人') }}</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col  :span="5">
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">{{ $t('是否服务人员') }}</el-checkbox>
               </el-form-item>
             </el-col>
 
-            <el-col  :span="5">
+            <el-col  :span="4">
+              <el-form-item>
+                <el-checkbox v-model="form.isworkerleader" :false-label="0" :true-label="1">{{ $t('是否服务主管') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
+
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">{{ $t('是否上图员') }}</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col  :span="5">
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" @change="salerChange">{{ $t('是否业务员') }}</el-checkbox>
               </el-form-item>
@@ -236,7 +242,8 @@ export default {
         'issalehr':'0',
         'tradefield':'',
         "salearea": [],
-        "type":0
+        "type":0,
+        "isworkerleader":0
       },
       value:[],
       drawer:false,

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

@@ -95,23 +95,30 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col  :span="5" style="height:51px">
+            <el-col  :span="4" style="height:51px">
               <el-form-item>
                 <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">{{ $t('是否部门负责人') }}</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col  :span="5">
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">{{ $t('是否服务人员') }}</el-checkbox>
               </el-form-item>
             </el-col>
 
-            <el-col  :span="5">
+            <el-col  :span="4">
+              <el-form-item>
+                <el-checkbox v-model="form.isworkerleader" :false-label="0" :true-label="1">{{ $t('是否服务主管') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">{{ $t('是否上图员') }}</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col  :span="5">
+            <el-col  :span="4">
               <el-form-item>
                 <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" disabled>{{ $t('是否业务员') }}</el-checkbox>
               </el-form-item>
@@ -215,7 +222,8 @@ export default {
         'isuppictured':'0',
         'reporthrname':'',
         'issalehr':'0',
-        "salearea": []
+        "salearea": [],
+        "isworkerleader":0
       },
       value:[],
       deplist:[],