服务工单，bug修复

src/HDrpManagement/serveBill/index.vue

@@ -148,6 +148,11 @@
               $t(scope.data.column.data[[scope.data.column.columnname]] || '--')
             }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'status_workorder'">
+          <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{
+              $t(scope.data.column.data[[scope.data.column.columnname]] || '--')
+            }}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'province'">
           {{ `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}` }}
         </div>

src/HDrpManagement/serveBill/modules/detail.vue

@@ -253,6 +253,13 @@ export default {
         {label:'业务员电话',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
         {label:'项目名称',value:this.mainData.projectnote ? this.mainData.projectnote : ''},
         {label:'历史服务次数',value:this.mainData.historicalservicesqty ? this.mainData.historicalservicesqty : ''},
+        {label:'工单状态',value:this.mainData.status_workorder ? this.mainData.status_workorder : '',
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.status_workorder)
+            return style
+          }
+        },
+        {label:'工单完成时间',value:this.mainData.finishdate_workorder ? this.mainData.finishdate_workorder : ''},
         {label:'异常类型',value:this.mainData.exception_type ? this.mainData.exception_type : ''},
         {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
           style:function () {

src/HDrpManagement/serveBillMag/index.vue

@@ -151,6 +151,11 @@
               $t(scope.data.column.data[[scope.data.column.columnname]] || '--')
             }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'status_workorder'">
+          <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{
+              $t(scope.data.column.data[[scope.data.column.columnname]] || '--')
+            }}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'province'">
           {{
             `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -204,6 +204,13 @@ export default {
         {label:'业务员电话',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
         {label:'项目名称',value:this.mainData.projectnote ? this.mainData.projectnote : ''},
         {label:'历史服务次数',value:this.mainData.historicalservicesqty ? this.mainData.historicalservicesqty : ''},
+        {label:'工单状态',value:this.mainData.status_workorder ? this.mainData.status_workorder : '',
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.status_workorder)
+            return style
+          }
+        },
+        {label:'工单完成时间',value:this.mainData.finishdate_workorder ? this.mainData.finishdate_workorder : ''},
         {label:'异常类型',value:this.mainData.exception_type ? this.mainData.exception_type : ''},
         {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
           style:function () {

src/HDrpManagement/serveWorkBill/components/acceptingOrders.vue

@@ -0,0 +1,169 @@
+<template>
+  <div>
+    <el-button size="mini" :type="!data.isleader?'':'primary'" @click="checkBtn" :disabled="!data.isleader">{{
+        $t("接单")
+      }}</el-button>
+    <el-drawer
+        :title="$t(`接单确认信息`)"
+        append-to-body
+        :show-close="false"
+        :visible.sync="drawShow"
+        @close="onClose"
+        size="800px"
+    >
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form
+              :model="form"
+              :rules="rules"
+              ref="form"
+              :label-width="tool.onlyZh('140px')"
+              label-position="top"
+              size="mini"
+          >
+            <el-col :span="24">
+              <el-form-item :label="$t(`是否外包工单:`)" prop="isout">
+                <el-radio-group v-model="form.isout">
+                  <el-radio :label="1">{{ $t("是") }}</el-radio>
+                  <el-radio :label="0">{{ $t("否") }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.isout">
+              <el-form-item :label="$t(`服务负责人:`)" prop="isout">
+                <el-select v-model="form.userid" placeholder="请选择服务负责人" style="width: 100%" size="small" @change="nameChange">
+                  <el-option
+                      v-for="item in optionNames"
+                      :key="item.index"
+                      :label="item.username"
+                      :value="item.userid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.isout">
+              <el-form-item :label="$t('服务负责人电话')" prop="phonenumber">
+                <el-input
+                    disabled
+                    v-model="form.phonenumber"
+                    :placeholder="$t(`服务负责人电话`)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button
+            size="small"
+            @click="drawShow = false"
+            class="normal-btn-width"
+        >{{ $t("取 消") }}</el-button
+        >
+        <el-button
+            size="small"
+            type="warning"
+            @click="onSubmit"
+            class="normal-btn-width btn-warning"
+        >{{ $t("确 定") }}</el-button
+        >
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "acceptingOrders",
+  props:["data",'team_userid'],
+  data(){
+    return {
+      drawShow:false,
+      form:{
+        "sa_workorderid": this.$route.query.id,
+        "isout":'', //是否外包
+        "userid": this.team_userid, //1566
+        "phonenumber":""
+      },
+      rules:{
+        isout: [
+          {
+            required: true,
+            message: this.$t("请选择是否外包工单"),
+            trigger: "change",
+          },
+        ],
+        userid: [
+          {
+            required: true,
+            message: this.$t("请选择服务负责人"),
+            trigger: "change",
+          },
+        ],
+        phonenumber: [
+          {
+            required: true,
+            message: this.$t("服务负责人电话不可为空"),
+            trigger: "change",
+          },
+        ],
+      },
+      personName:'',
+      optionNames:[]
+    }
+  },
+  methods:{
+    checkBtn(){
+      this.drawShow = true
+      this.form.isout = this.data.isout
+      this.queryPerson()
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          id:'20230210101103',
+          content:this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.drawShow = false
+          this.$emit('onSuccess')
+        })
+      })
+    },
+    async queryPerson(){
+      const res = await this.$api.requested({
+        id:20230213143003,
+        content:{
+          pageNumber:1,
+          pageSize:999,
+        }
+      })
+      this.optionNames = res.data.map(item => {
+        return {
+          "username":item.username,
+          "userid":item.userid,
+          "phonenumber":item.phonenumber
+        }
+      })
+    },
+    onClose(){
+      this.form.userid = ''
+      this.form.phonenumber = ''
+    },
+    nameChange(){
+      console.log('输出')
+      console.log(this.form.userid)
+      this.optionNames.forEach(item => {
+        if (item.userid == this.form.userid){
+          this.form.phonenumber = item.phonenumber
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/serveWorkBill/components/checkInfo.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="checkBtn">{{
+    <el-button size="mini" :type="!data.isServerMag && !data.isleader?'':'primary'" @click="checkBtn"
+               v-if="data.status == '待接单' || data.status == '待开始'" :disabled="!data.isServerMag && !data.isleader">{{
         $t("确认信息")
       }}</el-button>
     <el-drawer
@@ -10,7 +11,7 @@
         :visible.sync="drawShow"
         size="800px"
     >
-      <div class="drawer__panel">
+      <div class="drawer__panel" >
         <el-row :gutter="20">
           <el-form
               :model="form"
@@ -19,9 +20,10 @@
               :label-width="tool.onlyZh('140px')"
               label-position="top"
               size="mini"
+              :disabled="data.status == '待开始'"
           >
             <el-col :span="24">
-              <el-form-item :label="$t(`是否为我司出货产品:`)" prop="isouritem">
+              <el-form-item :label="$t(`是否为我司出货产品:`)" prop="isouritem" >
                 <el-radio-group v-model="form.isouritem">
                   <el-radio :label="1">{{ $t("是") }}</el-radio>
                   <el-radio :label="0">{{ $t("否") }}</el-radio>
@@ -154,6 +156,10 @@ export default {
           id:'2026012714172302',
           content:this.form
         })
+        this.tool.showMessage(res,()=>{
+          this.drawShow = false
+          this.$emit('onSuccess')
+        })
       })
     },
     async uploadSuccess(res1){

src/HDrpManagement/serveWorkBill/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :type="editDis?'':'primary'" @click="editBtn" :disabled="editDis">{{
+    <el-button v-if="data.status != '已完成' && data.status != '已中止'" size="mini" :type="editDis && !data.isServerMag?'':'primary'" @click="editBtn" :disabled="editDis && !data.isServerMag">{{
       $t("编 辑")
     }}</el-button>
     <el-drawer
@@ -465,7 +465,7 @@ export default {
     this.editDis = true
     if (this.data){
       this.data.team.forEach(item =>{
-        if (item.userid == this.userid){
+        if (item.userid == this.userid && item.isleader){
           this.editDis = false
         }
       })

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -10,6 +10,7 @@
       idname="sa_workorderid"
       ownertable="sa_workorder"
       tabName="tab1"
+      SalesmanQ="不执行"
       tags=""
       :tabs="['服务申请','服务工单','服务改善']"
       @pageChange="pageChange"
@@ -17,9 +18,9 @@
     >
       <div slot="tags"></div>
       <div slot="customOperation">
-        <checkInfo :data="mainData" class="inline-16"></checkInfo>
+        <checkInfo :data="mainData" class="inline-16" @onSuccess="queryMainData"></checkInfo>
         <transferWorkOrder btnType="primary" btnTitle="转工单" class="inline-16" @dialogShow="queryPerson" :disabledSubmit="personName == ''"
-        @onSubmit="transferWorkSubmit" ref="transferWorkRef">
+        @onSubmit="transferWorkSubmit" v-if="mainData.status == '待接单'" ref="transferWorkRef" :data="mainData" :disabled="!mainData.isServerMag && !mainData.isleader">
           <template slot="formRule">
             <div>
               <span style="color: red">*</span>{{$t(`请选择工单负责人`)}}
@@ -36,25 +37,26 @@
             </div>
           </template>
         </transferWorkOrder>
-         <customBtn
-          btnName="接单"
-          message="确认接单当前服务工单吗?"
-          idName="20230210101103"
-          keyName="sa_workorderid"
-          :id="$route.query.id"
-          @onSuccess="queryMainData"
-          class="inline-16"
-          v-if="mainData.status == '新建' && tool.checkAuth($route.name,'join')"
-        />
+        <acceptingOrders :data="mainData" class="inline-16" v-if="mainData.status == '待接单'" :team_userid="team_userid" @onSuccess="queryMainData"></acceptingOrders>
+<!--         <customBtn-->
+<!--          btnName="接单"-->
+<!--          message="确认接单当前服务工单吗?"-->
+<!--          idName="20230210101103"-->
+<!--          keyName="sa_workorderid"-->
+<!--          :id="$route.query.id"-->
+<!--          @onSuccess="queryMainData"-->
+<!--          class="inline-16"-->
+<!--        />-->
         <customBtn
-          btnName="开始"
+          btnName="开始工单"
           message="确认开始当前服务工单吗?"
           idName="20230209144503"
           keyName="sa_workorderid"
+          :disabled="!mainData.isleader"
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '待开始' && tool.checkAuth($route.name,'start')"
+          v-if="mainData.status == '待开始'"
 
         />
         <customBtn
@@ -63,10 +65,11 @@
           idName="20230209144603"
           keyName="sa_workorderid"
           :id="$route.query.id"
+          :disabled="!mainData.isleader"
           @onSuccess="queryMainData"
           class="inline-16"
           v-if="
-            mainData.status == '进行中' && tool.checkAuth($route.name, 'stop')
+            mainData.status == '进行中'
           "
         />
         <customBtn
@@ -74,36 +77,55 @@
           message="确认启用当前服务工单吗?"
           idName="20230209144703"
           keyName="sa_workorderid"
+          :disabled="!mainData.isleader"
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
           v-if="
-            mainData.status == '暂停' && tool.checkAuth($route.name, 'used')
+            mainData.status == '暂停'
           "
         />
-         <customBtn
-          btnName="完结"
-          message="确认完结当前服务工单吗?"
-          idName="20230209144903"
-          keyName="sa_workorderid"
-          :id="$route.query.id"
-          @onSuccess="queryMainData"
-          class="inline-16"
-          v-if="mainData.status != '新建' && tool.checkAuth($route.name,'complete')"
+        <customBtn
+            btnName="完结工单"
+            message="确认完结当前服务工单吗?"
+            idName="20230209144903"
+            keyName="sa_workorderid"
+            :disabled="!mainData.isleader"
+            :id="$route.query.id"
+            @onSuccess="queryMainData"
+            class="inline-16"
+            v-if="mainData.status == '进行中'"
 
         />
         <customBtn
-          btnName="作废"
-          message="确认作废当前服务工单吗?"
-          idName="20230209144803"
-          keyName="sa_workorderid"
-          :id="$route.query.id"
-          @onSuccess="queryMainData"
-          class="inline-16"
-          v-if="
-            mainData.status != '完结' && tool.checkAuth($route.name, 'delete')
-          "
+            btnName="中止"
+            message="确认中止当前服务申请单吗?"
+            idName="2026012414051502"
+            keyName="sa_serviceorderid"
+            :id="$route.query.id"
+            :dialog="true"
+            :checkString="true"
+            dialogTitle="请输入中止原因"
+            :disabled="!mainData.isleader"
+            dialogKey="abortreason"
+            @onSuccess="queryMainData"
+            errorMessage="中止原因不可为空"
+            v-if="mainData.status != '已完成' && mainData.status != '已中止'"
+            class="inline-16"
+
         />
+<!--        <customBtn-->
+<!--          btnName="作废"-->
+<!--          message="确认作废当前服务工单吗?"-->
+<!--          idName="20230209144803"-->
+<!--          keyName="sa_workorderid"-->
+<!--          :id="$route.query.id"-->
+<!--          @onSuccess="queryMainData"-->
+<!--          class="inline-16"-->
+<!--          v-if="-->
+<!--            mainData.status != '完结' && tool.checkAuth($route.name, 'delete')-->
+<!--          "-->
+<!--        />-->
       </div>
       <div slot="slot0">
 
@@ -127,12 +149,13 @@ import selectTeam from "../components/teamSelect";
 import serviceWorkOrder from '../modules/serviceWorkOrder/index'
 import checkInfo from '../components/checkInfo'
 import transferWorkOrder from '@/components/dialogTemplate/index2'
+import acceptingOrders from '../components/acceptingOrders'
 import { log } from "@antv/g2plot/lib/utils";
 export default {
   name: "detail",
   data() {
     return {
-      mainData: "",
+      mainData: {isServerMag:false,isleader:false},
       mainAreaData: {},
       detailInfo: "",
       nodes: [],
@@ -141,7 +164,10 @@ export default {
       team_name:'',
       team_phone_number:'',
       personName:'',
-      optionNames:[]
+      optionNames:[],
+      hrid:JSON.parse(sessionStorage.getItem('active_account')).hrid,
+      userid:JSON.parse(sessionStorage.getItem('active_account')).userid,
+      team_userid:''
     };
   },
   components: {
@@ -155,22 +181,45 @@ export default {
     selectTeam,
     serviceWorkOrder,
     checkInfo,
-    transferWorkOrder
+    transferWorkOrder,
+    acceptingOrders
   },
   methods: {
     async queryMainData(id) {
+      this.mainData.isServerMag = false
+      this.mainData.isleader = false
+      if (this.hrid !== 0){
+        const res_hrid = await this.$api.requested({
+          classname: 'webmanage.hr.hr',
+          method:"query_hrMain",
+          content: {
+            hrid: this.hrid
+          },
+        })
+        if (res_hrid.data && res_hrid.data.userrole.length > 0){
+          res_hrid.data.userrole.forEach(item => {
+            if (item.rolename == 'SHZG' && item.remarks == '服务主管'){
+              this.mainData.isServerMag = true
+            }
+          })
+        }
+      }
       const res = await this.$api.requested({
         id: 20230208140103,
         content: {
           sa_workorderid: this.$route.query.id,
         },
       });
-      this.mainData = res.data;
+      this.mainData = Object.assign({}, this.mainData, res.data);
       console.log(res.data,'输出33');
       res.data.team.forEach(item => {
         if (item.isleader){
           this.team_name = item.name
           this.team_phone_number = item.phonenumber
+          this.team_userid = item.userid
+          if (item.userid == this.userid){
+            this.mainData.isleader = true
+          }
         }
       })
       this.changeDataStructure();
@@ -478,6 +527,7 @@ export default {
 
     },
     async transferWorkSubmit(){
+      console.log('执行222')
       const res = await this.$api.requested({
         "content": {
           "sa_workorderid": this.$route.query.id,

src/components/normal-basic-layout-new/details/modules/tabs/tab.vue

@@ -35,7 +35,7 @@ import datalog from '../datalog/index.vue'
 import followTable from '../followTable/index'
 
 export default {
-  props:['tabs','editData','ownertable','idname','status','ownerid','disabled','isFollow'],
+  props:['tabs','editData','ownertable','idname','status','ownerid','disabled','isFollow','SalesmanQ'],
   components:{
     attachmentList,
     upload,
@@ -98,7 +98,12 @@ export default {
         this.activeName = 'tab0'
       }
     }, 1000);
-    this.isSalesman()
+    if (this.SalesmanQ == '不执行'){
+
+    }else {
+      this.isSalesman()
+    }
+
   },
   watch: {
     activeName (val) {

src/components/normal-basic-layout/details/index.vue

@@ -140,7 +140,7 @@ import {mapGetters} from 'vuex'
 export default {
   props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler',
     'mainData','status','typeTask','isGroup','isBatch','modelName','isDelete','column','attachmentDisabled','disabled','isGoDetail','detailPath','nowDetailPath','detailId',
-  'isAdmin','btnNameReport','delHide','tabName'],
+  'isAdmin','btnNameReport','delHide','tabName','SalesmanQ'],
   data () {
     return {
       drawer:false,

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -35,7 +35,7 @@ import datalog from '../datalog/index.vue'
 import followTable from '../followTable/index'
 
 export default {
-  props:['tabs','editData','ownertable','idname','status','attachmentDisabled','disabled','isFollow','tabName'],
+  props:['tabs','editData','ownertable','idname','status','attachmentDisabled','disabled','isFollow','tabName','SalesmanQ'],
   components:{
     attachmentList,
     upload,
@@ -100,7 +100,11 @@ export default {
         this.activeName = this.tabName?this.tabName:'tab0'
       }
     }, 100);
-    this.isSalesman()
+    if (this.SalesmanQ == '不执行'){
+
+    }else {
+      this.isSalesman()
+    }
   },
   watch: {
     activeName (val) {