Merge branch 'greenUrgent' into allTestUrgent

src/HDrpManagement/serveBill/modules/detail.vue

@@ -9,20 +9,11 @@
       idname="sa_serviceorderid"
       ownertable="sa_serviceorder"
       :delApiId="20230206091803"
-      :statusCheck="[
-        { key: 'status', value: '待处理' },
-        { key: 'status', value: '进行中' },
-        { key: 'status', value: '提交' },
-        { key: 'status', value: '待指派' },
-        { key: 'status', value: '已完成' },
-      ]"
+      :statusCheck="[{key:'status',value:'已受理'},{key:'status',value:'已中止'}]"
       :status="mainData.status"
+      :delHide="mainData.status !== '新建' || submitDis"
       tags=""
-      :tabs="
-        mainData.servicetype == '售前' || mainData.servicetype == '历史售后'
-          ? ['详细信息', '关联工单']
-          : ['详细信息', '服务商品', '关联工单']
-      "
+      :tabs="['服务申请']"
       @hrMain="hrMain"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)"
@@ -30,16 +21,14 @@
       <div slot="tags"></div>
       <div slot="customOperation">
         <Edit
-          v-if="
-            tool.checkAuth($route.name, 'update') && ((mainData.status == '新建' && isworker == 0) || isworker == 1)
-          "
-          class="inline-16"
+            v-if="tool.checkAuth($route.name,'update') && ((mainData.status == '新建' && isworker == 0) || isworker == 1) && mainData.status != '已受理' && mainData.status != '已中止'"
+            class="inline-16"
           :data="mainData"
           @onSuccess="queryMainData"
         />
         <changeBill
           v-if="
-            mainData.status == '待指派' &&
+            mainData.status == '已提交' &&
             tool.checkAuth($route.name, 'changeBill')
           "
           class="inline-16"
@@ -54,6 +43,7 @@
           :id="$route.query.id"
           :paramData="[{ key: 'issumbit', value: 1 }]"
           @onSuccess="queryMainData"
+          :disabled="(hrid == 0 && usertype == 0) || submitDis"
           class="inline-16"
           v-if="
             mainData.status == '新建' && tool.checkAuth($route.name, 'submit')
@@ -67,18 +57,39 @@
           :id="$route.query.id"
           :paramData="[{ key: 'issumbit', value: 0 }]"
           :dialog="true"
+          :checkString="true"
           dialogTitle="请输入退回原因"
           dialogKey="backreason"
           @onSuccess="queryMainData"
+          errorMessage="退回原因不可为空"
           class="inline-16"
           v-if="
-            mainData.status == '待指派' &&
+            mainData.status == '已提交' &&
             tool.checkAuth($route.name, 'resubmit')
           "
         />
+        <customBtn
+            btnName="中止"
+            message="确认中止当前服务申请单吗?"
+            idName="2026012414051502"
+            keyName="sa_serviceorderid"
+            :id="$route.query.id"
+            :dialog="true"
+            :checkString="true"
+            dialogTitle="请输入中止原因"
+            dialogKey="abortreason"
+            @onSuccess="queryMainData"
+            errorMessage="中止原因不可为空"
+            class="inline-16"
+            v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'suspension')"
+        />
       </div>
       <div slot="slot0">
-        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+<!--        <detailInfo :more="true" :data="detailInfo"></detailInfo>-->
+        <serviceApplication
+            :detailInfo="detailInfo" :mainData="mainData" :detailInfo2="detailInfo2"
+            :activeName="mainData.servicetype == '售前' || mainData.servicetype == '历史售后'?'申请信息':'服务商品'">
+        </serviceApplication>
       </div>
       <div slot="slot2">
         <workBill ref="workBill">
@@ -145,6 +156,7 @@ import Edit from "../components/edit";
 import workBill from "./workBill/index";
 import productTable from "./product/index";
 import addProduct from "./product/add";
+import serviceApplication from "@/HDrpManagement/serveBillMag/components/serviceApplication";
 export default {
   name: "detail",
   data() {
@@ -152,7 +164,13 @@ export default {
       mainData: {},
       mainAreaData: {},
       detailInfo: [],
-      isworker:''
+      detailInfo2:[],
+      isworker:'',
+      hrid:JSON.parse(sessionStorage.getItem('active_account')).hrid,
+      nowUserid:JSON.parse(sessionStorage.getItem('active_account')).userid,
+      usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype,
+      submitDis:true,
+      hrData:''
     };
   },
   components: {
@@ -162,11 +180,32 @@ export default {
     workBill,
     productTable,
     addProduct,
+    serviceApplication
   },
   methods: {
     hrMain(data){
-      console.log(data,'输出data')
+      this.hrData = data
+      this.submitDis = true
       this.isworker = data.isworker
+      if (data.hrid == this.mainData.saler_hrid){
+        this.submitDis = false
+      }else {
+        this.proxyData(this.mainData.saler_userid)
+      }
+    },
+    async proxyData(userid){
+      const res = await this.$api.requested({
+        "id":20230302174201,
+        "content": {
+          "leaderuserid": userid,
+          "isproxy":1
+        }
+      })
+      res.data.forEach(item => {
+        if (item.userid == this.nowUserid && item.editable){
+          this.submitDis = false
+        }
+      })
     },
     async queryMainData(id) {
       const res = await this.$api.requested({
@@ -178,172 +217,129 @@ export default {
       this.mainData = res.data;
 
       this.changeDataStructure();
+      this.hrMain(this.hrData)
     },
     changeDataStructure() {
       let that = this;
       this.mainAreaData = [
-        /* {label:'单号',value:this.mainData.billno ? this.mainData.billno : ''},*/
-        {
-          label: "单据日期",
-          value: this.mainData.billdate ? this.mainData.billdate : "",
-        },
-        {
-          label: "状态",
-          value: this.mainData.status ? this.$t(this.mainData.status) : "",
-          style: function () {
-            let style = that.tool.getStatusColor(that.mainData.status);
-            return style;
-          },
-        },
-        /* {label:'经销商编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},*/
-        {
-          label: "企业名称",
-          value: this.mainData.enterprisename
-            ? this.mainData.enterprisename
-            : "",
-        },
-        {
-          label: "省市县",
-          value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`,
-        },
-        {
-          label: "地址",
-          value: this.mainData.address ? this.mainData.address : "",
-        },
-        {
-          label: "服务开始时间",
-          value: this.mainData.begdate
-            ? this.mainData.begdate.slice(0, this.mainData.begdate.indexOf(" "))
-            : "",
-        },
-        {
-          label: "服务结束时间",
-          value: this.mainData.enddate
-            ? this.mainData.enddate.slice(0, this.mainData.enddate.indexOf(" "))
-            : "",
+        {label:'单号',value:this.mainData.billno ? this.mainData.billno : ''},
+        {label:'单据日期',value:this.mainData.billdate ? this.mainData.billdate : ''},
+        {label:'状态',value:this.mainData.status ?this.$t(this.mainData.status)  : '',
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.status)
+            return style
+          }
         },
-        {
-          label: "服务分类",
-          value: this.mainData.servicetype ? this.mainData.servicetype : "",
+        {label:'企业名称',value:this.mainData.enterprisename ? this.mainData.enterprisename : ''},
+        {label:'企业编码',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
+        {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
+        {label:'详细地址',value:this.mainData.address ? this.mainData.address : ''},
+        {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
+        {label:'服务类型',value:this.mainData.servicetype ? this.mainData.servicetype : '',
           style:function () {
             let style = that.tool.getStatusColor(that.mainData.servicetype)
             return style
           }
         },
-        {
-          label: "应用系统",
-          value: this.mainData.class1 ? this.mainData.class1 : "",
-        },
-        {
-          label: "客诉大类",
-          value: this.mainData.class2 ? this.mainData.class2 : "",
-        },
-        {
-          label: "业务员",
-          value: this.mainData.saler_name ? this.mainData.saler_name : "",
-        },
-        {
-          label: "业务员手机号",
-          value: this.mainData.saler_phonenumber
-            ? this.mainData.saler_phonenumber
-            : "",
-        },
-        {
-          label: "问题描述",
-          value: this.mainData.reason ? this.mainData.reason : "",
+        {label:'现场联系人',value:this.mainData.scenecontact ? this.mainData.scenecontact : ''},
+        {label:'身份备注',value:this.mainData.scenecontactrole ? this.mainData.scenecontactrole : ''},
+        {label:'现场联系电话',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
+        {label:'应用系统',value:this.mainData.class1 ? this.mainData.class1 : ''},
+        {label:'客诉大类',value:this.mainData.class2 ? this.mainData.class2 : ''},
+        {label:'服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+        {label:'服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+        {label:'问题描述',value:this.mainData.reason ? this.mainData.reason : ''},
+        {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+        {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.exception_type ? this.mainData.exception_type : ''},
+        {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.service_level)
+            return style
+          }
         },
-        /*
-        {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
-
-        {label:'服务联系人',value:this.mainData.scenecontact ? this.mainData.scenecontact : ''},
-        {label:'联系人角色',value:this.mainData.scenecontactrole ? this.mainData.scenecontactrole : ''},
-        {label:'服务联系电话',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
-
-
-
-
-        {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},*/
+        {label:'评估意见',value:this.mainData.evaluation_comment ? this.mainData.evaluation_comment : ''},
+        {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
       ];
       this.detailInfo = [
         {
           title: "基本信息",
           info: [
-            { label: "单号", value: this.mainData.billno },
-            { label: "单据日期", value: this.mainData.billdate },
-            {
-              label: "状态",
-              value: this.mainData.status ? this.$t(this.mainData.status) : "",
-              style: function () {
-                let style = that.tool.getStatusColor(that.mainData.status);
-                return style;
-              },
-            },
-            { label: "企业编号", value: this.mainData.agentnum },
-            { label: "企业名称", value: this.mainData.enterprisename },
-            {
-              label: "省市县",
-              value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`,
+            {label:'申请单号',value:this.mainData.billno},
+            {label:'单据日期',value:this.mainData.billdate},
+            {label:'状态',value:this.$t(this.mainData.status),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.status)
+                return style
+              }
             },
-            { label: "关联订单", value: this.mainData.sonum },
-            { label: "服务分类", value: this.mainData.servicetype,
+            {label:'企业名称',value:this.mainData.enterprisename},
+            {label:'企业编号',value:this.mainData.agentnum},
+            {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
+            {label:'详细地址',value:this.mainData.address ? this.mainData.address : ''},
+            {label:'关联订单',value:this.mainData.sonum},
+            {label:'服务类型',value:this.mainData.servicetype,
               style:function () {
                 let style = that.tool.getStatusColor(that.mainData.servicetype)
                 return style
-
               }
             },
-            { label: "现场联系人", value: this.mainData.scenecontact },
-            { label: "身份备注", value: this.mainData.scenecontactrole },
-            {
-              label: "现场联系人手机号",
-              value: this.mainData.scenecontactphonenumber,
-            },
-            { label: "应用系统", value: this.mainData.class1 },
-            { label: "客诉大类", value: this.mainData.class2 },
-            { label: "问题描述", value: this.mainData.reason },
-            {
-              label: "服务开始时间",
-              value: this.mainData.begdate
-                ? this.mainData.begdate.slice(
-                    0,
-                    this.mainData.begdate.indexOf(" ")
-                  )
-                : "",
-            },
-            {
-              label: "服务结束时间",
-              value: this.mainData.enddate
-                ? this.mainData.enddate.slice(
-                    0,
-                    this.mainData.enddate.indexOf(" ")
-                  )
-                : "",
-            },
-            {
-              label: "业务员",
-              value: this.mainData.saler_name ? this.mainData.saler_name : "",
-            },
-            {
-              label: "业务员手机号",
-              value: this.mainData.saler_phonenumber
-                ? this.mainData.saler_phonenumber
-                : "",
-            },
-            {
-              label: "备注",
-              value: this.mainData.remarks ? this.mainData.remarks : "",
+            {label:'现场联系人',value:this.mainData.scenecontact},
+            {label:'身份备注',value:this.mainData.scenecontactrole},
+            {label:'现场联系人电话',value:this.mainData.scenecontactphonenumber},
+            {label:'应用系统',value:this.mainData.class1},
+            {label:'客诉大类',value:this.mainData.class2},
+            {label:'问题描述',value:this.mainData.reason},
+            {label:'服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+            {label:'服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+            {label:'项目名称',value:this.mainData.projectnote ? this.mainData.projectnote : ''},
+            {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+            {label:'业务员电话',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
+            {label:'异常类型',value:this.mainData.exception_type ? this.mainData.exception_type : ''},
+            {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.service_level)
+                return style
+              }
             },
+            {label:'评估意见',value:this.mainData.evaluation_comment ? this.mainData.evaluation_comment : ''},
+            {label:'历史服务次数',value:this.mainData.historicalservicesqty ? this.mainData.historicalservicesqty : ''},
+            {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
           ],
         },
         {
           title: "系统信息",
           info: [
-            { label: "创建人", value: this.mainData.createby },
-            { label: "创建时间", value: this.mainData.createdate },
-            { label: "提交人", value: this.mainData.submitby },
-            { label: "提交时间", value: this.mainData.submitdate },
+            {label:'创建时间',value:this.mainData.createdate},
+            {label:'最近编辑时间',value:this.mainData.changedate},
+            {label:'提交时间',value:this.mainData.submitdate},
+            {label:'创建人',value:this.mainData.createby},
+            {label:'最近编辑人',value:this.mainData.changeby},
+            {label:'提交人',value:this.mainData.submitby},
           ],
         },
+      ]
+      this.detailInfo2 = [
+        {
+          title:'确认信息',
+          info: [
+            {label:'供应方',value:this.mainData.supplier}
+          ]
+        },
+        {
+          title:'系统信息',
+          info: [
+            {label:'最近编辑人',value:this.mainData.changeby},
+            {label:'最近编辑时间',value:this.mainData.changedate},
+            {label:'转单人',value:this.mainData.transformer},
+            {label:'转单时间',value:this.mainData.transdate},
+            {label:'退回原因',value:this.mainData.backreason},
+            {label:'中止时间',value:this.mainData.abortdate},
+            {label:'中止原因',value:this.mainData.abortreason}
+          ]
+        }
       ];
     },
     // 监听切换数据,上一页,下一页

src/HDrpManagement/serveBillMag/components/serviceApplication.vue

@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="服务商品" name="服务商品" v-if="mainData.servicetype != '售前' && mainData.servicetype != '历史售后'">
+        <productTable ref="product">
+          <addProduct v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" slot="addProduct" :data="mainData" @onSuccess="$refs.product.listData()" />
+          <template v-slot:editProduct="scope">
+            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" type="text" size="mini" @click="$refs.product.currentProduct=scope.data">{{$t('编 辑')}}</el-button>
+          </template>
+          <template v-slot:delProduct="scope">
+            <delete-btn nameId="20230206162003" v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" nameKey="sa_serviceorderitemsids" :id="scope.data.sa_serviceorderitemsid" @deleteSuccess="$refs.product.listData()"></delete-btn>
+          </template>
+        </productTable>
+      </el-tab-pane>
+      <el-tab-pane label="申请信息" name="申请信息">
+        <detailInfo :more="true"  :data="detailInfo"></detailInfo>
+      </el-tab-pane>
+      <el-tab-pane label="受理信息" name="受理信息">
+        <infoDetail title="确认信息" title2="系统信息" :data="detailInfo2"></infoDetail>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import detailInfo from '@/components/detailInfo/index'
+import productTable from '../modules/product/index'
+import addProduct from '../modules/product/add'
+import infoDetail from '@/components/InfoDetail/index'
+export default {
+  name: "serviceApplication",
+  components:{detailInfo,productTable,addProduct,infoDetail},
+  props:['detailInfo','mainData','activeName','detailInfo2'],
+  data(){
+    return {
+
+    }
+  },
+  methods:{
+    handleClick(){}
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -10,17 +10,19 @@
         ownertable="sa_serviceorder"
         :delApiId="20230206091803"
         :status="mainData.status"
-        :statusCheck="[{key:'status',value:'待处理'},{key:'status',value:'进行中'},{key:'status',value:'提交'},{key:'status',value:'待指派'},{key:'status',value:'已完成'}]"
+        :statusCheck="[{key:'status',value:'已受理'},{key:'status',value:'已中止'}]"
+        :delHide="mainData.status !== '新建' || submitDis"
         tags=""
-        :tabs="mainData.servicetype == '售前' || mainData.servicetype == '历史售后'?['详细信息','关联工单']:['详细信息','服务商品','关联工单']"
+        :tabs="['服务申请']"
         @hrMain="hrMain"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <Edit v-if="tool.checkAuth($route.name,'update') && ((mainData.status == '新建' && isworker == 0) || isworker == 1)" class="inline-16" :data="mainData" @onSuccess="queryMainData" />
-        <changeBill v-if="mainData.status == '待指派' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
+        <Edit v-if="tool.checkAuth($route.name,'update') && ((mainData.status == '新建' && isworker == 0) || isworker == 1) && mainData.status != '已受理' && mainData.status != '已中止'"
+              class="inline-16" :data="mainData" @onSuccess="queryMainData" />
+        <changeBill v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
         <customBtn
           btnName="提交"
           message="确认提交当前服务申请单吗?"
@@ -29,6 +31,7 @@
           :id="$route.query.id"
           :paramData="[{key:'issumbit',value:1}]"
           @onSuccess="queryMainData"
+          :disabled="(hrid == 0 && usertype == 0) || submitDis"
           class="inline-16"
           v-if="mainData.status == '新建' && tool.checkAuth($route.name,'submit')"
         />
@@ -40,15 +43,36 @@
           :id="$route.query.id"
           :paramData="[{key:'issumbit',value:0}]"
           :dialog="true"
+          :checkString="true"
           dialogTitle="请输入退回原因"
           dialogKey="backreason"
           @onSuccess="queryMainData"
+          errorMessage="退回原因不可为空"
           class="inline-16"
-          v-if="mainData.status == '待指派' && tool.checkAuth($route.name,'resubmit')"
+          v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'resubmit')"
+        />
+        <customBtn
+            btnName="中止"
+            message="确认中止当前服务申请单吗?"
+            idName="2026012414051502"
+            keyName="sa_serviceorderid"
+            :id="$route.query.id"
+            :dialog="true"
+            :checkString="true"
+            dialogTitle="请输入中止原因"
+            dialogKey="abortreason"
+            @onSuccess="queryMainData"
+            errorMessage="中止原因不可为空"
+            class="inline-16"
+            v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'suspension')"
         />
       </div>
       <div slot="slot0" >
-        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+<!--        <detailInfo :more="true" :data="detailInfo"></detailInfo>-->
+        <serviceApplication
+            :detailInfo="detailInfo" :mainData="mainData" :detailInfo2="detailInfo2"
+            :activeName="mainData.servicetype == '售前' || mainData.servicetype == '历史售后'?'申请信息':'服务商品'">
+        </serviceApplication>
       </div>
       <div slot="slot2" >
         <workBill ref="workBill">
@@ -82,6 +106,7 @@ import Edit from '../components/edit'
 import workBill from './workBill/index'
 import productTable from './product/index'
 import addProduct from './product/add'
+import serviceApplication from '../components/serviceApplication'
 export default {
   name: "detail",
   data() {
@@ -89,7 +114,13 @@ export default {
       mainData:{},
       mainAreaData:{},
       detailInfo:[],
-      isworker:''
+      detailInfo2:[],
+      isworker:'',
+      hrid:JSON.parse(sessionStorage.getItem('active_account')).hrid,
+      nowUserid:JSON.parse(sessionStorage.getItem('active_account')).userid,
+      usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype,
+      submitDis:true,
+      hrData:''
     }
   },
   components:{
@@ -98,12 +129,33 @@ export default {
     Edit,
     workBill,
     productTable,
-    addProduct
+    addProduct,
+    serviceApplication
   },
   methods:{
     hrMain(data){
-      console.log(data,'输出data')
+      this.hrData = data
+      this.submitDis = true
       this.isworker = data.isworker
+      if (data.hrid == this.mainData.saler_hrid){
+        this.submitDis = false
+      }else {
+        this.proxyData(this.mainData.saler_userid)
+      }
+    },
+    async proxyData(userid){
+      const res = await this.$api.requested({
+        "id":20230302174201,
+        "content": {
+          "leaderuserid": userid,
+          "isproxy":1
+        }
+      })
+      res.data.forEach(item => {
+        if (item.userid == this.nowUserid && item.editable){
+          this.submitDis = false
+        }
+      })
     },
     async queryMainData(id) {
       const res = await this.$api.requested({
@@ -116,6 +168,7 @@ export default {
       console.log(this.mainData);
 
       this.changeDataStructure()
+      this.hrMain(this.hrData)
     },
     changeDataStructure() {
       let that = this
@@ -128,12 +181,12 @@ export default {
             return style
           }
         },
-        {label:'企业编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
         {label:'企业名称',value:this.mainData.enterprisename ? this.mainData.enterprisename : ''},
+        {label:'企业编码',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
         {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
-        {label:'地址',value:this.mainData.address ? this.mainData.address : ''},
+        {label:'详细地址',value:this.mainData.address ? this.mainData.address : ''},
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
-        {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : '',
+        {label:'服务类型',value:this.mainData.servicetype ? this.mainData.servicetype : '',
           style:function () {
             let style = that.tool.getStatusColor(that.mainData.servicetype)
             return style
@@ -141,23 +194,31 @@ export default {
         },
         {label:'现场联系人',value:this.mainData.scenecontact ? this.mainData.scenecontact : ''},
         {label:'身份备注',value:this.mainData.scenecontactrole ? this.mainData.scenecontactrole : ''},
-        {label:'现场联系人手机号',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
+        {label:'现场联系电话',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
         {label:'应用系统',value:this.mainData.class1 ? this.mainData.class1 : ''},
         {label:'客诉大类',value:this.mainData.class2 ? this.mainData.class2 : ''},
-        {label:'服务开始时间',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
-        {label:'服务结束时间',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+        {label:'服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+        {label:'服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
         {label:'问题描述',value:this.mainData.reason ? this.mainData.reason : ''},
         {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
-        {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
+        {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.exception_type ? this.mainData.exception_type : ''},
+        {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.service_level)
+            return style
+          }
+        },
+        {label:'评估意见',value:this.mainData.evaluation_comment ? this.mainData.evaluation_comment : ''},
         {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
       ]
       this.detailInfo = [
         {
           title:'基本信息',
           info: [
-            {label:'单号',value:this.mainData.billno},
+            {label:'申请单号',value:this.mainData.billno},
             {label:'单据日期',value:this.mainData.billdate},
             {label:'状态',value:this.$t(this.mainData.status),
               style:function () {
@@ -165,11 +226,12 @@ export default {
                 return style
               }
             },
-            {label:'企业编号',value:this.mainData.agentnum},
             {label:'企业名称',value:this.mainData.enterprisename},
+            {label:'企业编号',value:this.mainData.agentnum},
             {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
+            {label:'详细地址',value:this.mainData.address ? this.mainData.address : ''},
             {label:'关联订单',value:this.mainData.sonum},
-            {label:'服务分类',value:this.mainData.servicetype,
+            {label:'服务类型',value:this.mainData.servicetype,
               style:function () {
                 let style = that.tool.getStatusColor(that.mainData.servicetype)
                 return style
@@ -177,24 +239,57 @@ export default {
             },
             {label:'现场联系人',value:this.mainData.scenecontact},
             {label:'身份备注',value:this.mainData.scenecontactrole},
-            {label:'现场联系人手机号',value:this.mainData.scenecontactphonenumber},
+            {label:'现场联系人电话',value:this.mainData.scenecontactphonenumber},
             {label:'应用系统',value:this.mainData.class1},
             {label:'客诉大类',value:this.mainData.class2},
             {label:'问题描述',value:this.mainData.reason},
-            {label:'服务开始时间',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
-            {label:'服务结束时间',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+            {label:'服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+            {label:'服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+            {label:'项目名称',value:this.mainData.projectnote ? this.mainData.projectnote : ''},
             {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
-            {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
+            {label:'业务员电话',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
+            {label:'异常类型',value:this.mainData.exception_type ? this.mainData.exception_type : ''},
+            {label:'服务等级',value:this.mainData.service_level ? this.mainData.service_level : '',
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.service_level)
+                return style
+              }
+            },
+            {label:'评估意见',value:this.mainData.evaluation_comment ? this.mainData.evaluation_comment : ''},
+            {label:'历史服务次数',value:this.mainData.historicalservicesqty ? this.mainData.historicalservicesqty : ''},
             {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
           ]
         },
         {
           title:'系统信息',
           info: [
-            {label:'创建人',value:this.mainData.createby},
             {label:'创建时间',value:this.mainData.createdate},
-            {label:'提交人',value:this.mainData.submitby},
+            {label:'最近编辑时间',value:this.mainData.changedate},
             {label:'提交时间',value:this.mainData.submitdate},
+            {label:'创建人',value:this.mainData.createby},
+            {label:'最近编辑人',value:this.mainData.changeby},
+            {label:'提交人',value:this.mainData.submitby},
+
+          ]
+        }
+      ]
+      this.detailInfo2 = [
+        {
+          title:'确认信息',
+          info: [
+            {label:'供应方',value:this.mainData.supplier}
+          ]
+        },
+        {
+          title:'系统信息',
+          info: [
+            {label:'最近编辑人',value:this.mainData.changeby},
+            {label:'最近编辑时间',value:this.mainData.changedate},
+            {label:'转单人',value:this.mainData.transformer},
+            {label:'转单时间',value:this.mainData.transdate},
+            {label:'退回原因',value:this.mainData.backreason},
+            {label:'中止时间',value:this.mainData.abortdate},
+            {label:'中止原因',value:this.mainData.abortreason}
           ]
         }
       ]

src/HDrpManagement/serveBillMag/modules/product/add.vue

@@ -24,7 +24,7 @@
           :layout="tablecols"
           :data="orderList"
           :custom="true"
-          height="500px"
+          height="calc(100vh - 270px)"
           @upDateData="upDateData"
         >
           <template v-slot:customcol="scope">
@@ -33,12 +33,12 @@
             </div>
             <div v-else-if="scope.column.columnname == 'itemno'">
               {{scope.column.data[scope.column.columnname]}}
-              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
-                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
-                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
-                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
-                </div>
-              </div>
+<!--              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">-->
+<!--                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">-->
+<!--                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>-->
+<!--                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>-->
+<!--                </div>-->
+<!--              </div>-->
             </div>
             <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>
@@ -123,7 +123,7 @@ export default {
   created() {
     this.tablecols = this.tool.tabelCol(
       this.$route.name
-    ).productTable.tablecols;
+    ).productAddTable.tablecols;
   },
   watch: {
     dialogFormVisible(val) {
@@ -144,7 +144,6 @@ export default {
           itemid: item.itemid,
           reason: "",
           qty: 1,
-          traceabilitytype:item.traceabilitytype
         };
       });
       let res = await this.$api.requested({

src/HDrpManagement/serveBillMag/modules/product/index.vue

@@ -65,7 +65,7 @@ export default {
   props:["data"],
   data () {
     return {
-      tableHieght:"calc(100vh - 380px)",
+      tableHieght:"calc(100vh - 530px)",
       tablecols:[],
       list:[],
       total:0,

src/components/InfoDetail/index.vue

@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <div class="container" v-for="(item1,i) in data" :key="i">
+      <el-descriptions
+          :column="3"
+          :title="$t(item1.title)"
+          :labelStyle="{width:'140px',flex:'1 0 auto',}"
+          :contentStyle="{width:'250px',flex:'1 0 auto'}"
+          border
+      >
+        <el-descriptions-item
+            v-for="(item2,j) in item1.info"
+            :key="j"
+            :label="$t(item2.label)"
+        >
+          <span v-if="item2.label == '合作伙伴类型' || item2.label == '经销商类型'">
+            <span v-if="item2.value">
+              <el-tag  v-for="k in item2.value" :key="k.index" style="margin-left: 5px;margin-top: 5px">{{k}}</el-tag>
+            </span>
+            <span v-else>--</span>
+          </span>
+          <span v-else :style="item2.style?item2.style():''">
+            {{ item2.value ? $t(item2.value) : '--' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  props:['data','title','title2']
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/customBtn/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button
       :disabled="disabled ? disabled : false"
-      :type="type ? type : 'primary'"
+      :type="disabled?'':type  ? type : 'primary'"
       :size="size ? size : 'mini'"
       @click="submit"
     >{{ $t(btnName) }}</el-button>
@@ -31,8 +31,10 @@ export default {
     dialogTitle: String,
     dialogKey: String,
     checkContent: Boolean,
+    checkString: Boolean,
     size: String,
     delType: String,
+    errorMessage:String
   },
   data() {
     return {};
@@ -45,7 +47,8 @@ export default {
         this.$prompt(this.$t(this.dialogTitle), this.$t("提示"), {
           confirmButtonText: this.$t("确定"),
           cancelButtonText: this.$t("取消"),
-          inputPattern: this.checkContent ? /^[\d.]+$/ : "",
+          inputPattern: this.checkContent ? /^[\d.]+$/ : this.checkString ? /^\S.*$/ : "",
+          inputErrorMessage: this.$t(this.errorMessage)
         }).then(async ({ value }) => {
           let param = {
             content: {},
@@ -73,6 +76,11 @@ export default {
               this.$emit("onSuccess", res.data);
             });
           }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: this.$t('已取消')
+          });
         });
       } else {
         this.$confirm(this.$t(this.message), this.$t("提示"), {
@@ -92,6 +100,11 @@ export default {
           this.tool.showMessage(res, () => {
             this.$emit("onSuccess", res.data);
           });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: this.$t('已取消')
+          });
         });
       }
     },

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

@@ -21,7 +21,7 @@
           <div class="mt-10">
             <slot name="customOperation" class="inline-16"></slot>
           </div>
-          <el-button v-if="isAdmin || (tool.checkAuth($route.name,'delete') && delApiId)" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData" style="margin-top: -10px">{{$t('删 除')}}</el-button>
+          <el-button v-if="(isAdmin || (tool.checkAuth($route.name,'delete') && delApiId)) && !delHide" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData" style="margin-top: -10px">{{$t('删 除')}}</el-button>
          <div v-if="!pageChange" class="mt-10">
             <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
             <el-button size="mini" @click="next()" :disabled="turnTotal?$route.query.rowindex  == turnTotal:false"><i class="el-icon-arrow-right" ></i></el-button>
@@ -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'],
+  'isAdmin','btnNameReport','delHide'],
   data () {
     return {
       drawer:false,