暂存

src/HDrpManagement/serveWorkBill/components/edit.vue

@@ -463,11 +463,13 @@ export default {
   mounted() {
     console.log(this.data,'输出data的数据222')
     this.editDis = true
-    this.data.team.forEach(item =>{
-      if (item.userid == this.userid){
-        this.editDis = false
-      }
-    })
+    if (this.data){
+      this.data.team.forEach(item =>{
+        if (item.userid == this.userid){
+          this.editDis = false
+        }
+      })
+    }
   },
   created() {},
 };

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -10,11 +10,7 @@
       idname="sa_workorderid"
       ownertable="sa_workorder"
       tags=""
-      :tabs="
-        mainData.actiontype == '工序模板'
-          ? ['工序详情', '确认单', '服务团队', '工单物料', '详细信息']
-          : ['服务商品', '确认单', '服务团队', '详细信息']
-      "
+      :tabs="['服务申请','服务工单','服务改善']"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)"
     >
@@ -89,95 +85,101 @@
           "
         />
       </div>
-      <div slot="slot0" v-if="mainData.actiontype == '工序模板'">
-        <taskDetail :data="nodes">
-          <template v-slot:detail="scope">
-            <taskListDetail
-              class="inline-16"
-              :data="scope.data"
-            ></taskListDetail>
-          </template>
-          <!-- <template v-slot:edit="scope">
-            <taskListEdit class="inline-16" :data="scope.data"/>
-          </template> -->
-        </taskDetail>
-      </div>
-      <div slot="slot1" v-if="mainData.actiontype == '工序模板'">
-        <checkBill ref="checkBillRef">
-          <template v-slot:download="scope">
-            <el-button
-              v-if="tool.checkAuth($route.name, 'checkBillDetail')"
-              type="text"
-              size="mini"
-              @click="downLoadBill(scope.data)"
-              >{{ $t("单 据 下 载") }}</el-button
-            >
-          </template>
-        </checkBill>
-      </div>
-      <div slot="slot2" v-if="mainData.actiontype == '工序模板'">
-        <teamList
-          v-if="tool.checkAuth($route.name, 'teamList')"
-          ref="teamList"
-          :data="mainData.team"
-        >
-          <selectTeam ref="team" @teamChange="teamChange" slot="add">
-            <el-button
-              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"
-              class="button-new-tag"
-              size="small"
-              type="primary"
-              @click="$refs.team.dialogFormVisible = true"
-              >{{ $t("添 加") }}</el-button
-            >
-          </selectTeam>
-        </teamList>
-      </div>
-      <div slot="slot3" v-if="mainData.actiontype == '工序模板'">
-        <Items :data="mainData"></Items>
-      </div>
-      <div slot="slot4" v-if="mainData.actiontype == '工序模板'">
-        <detailInfo :more="true" :data="detailInfo"></detailInfo>
-      </div>
+      <div slot="slot0">
 
-      <div slot="slot0" v-if="mainData.actiontype != '工序模板'">
-        <Items :data="mainData"></Items>
-      </div>
-      <div slot="slot1" v-if="mainData.actiontype != '工序模板'">
-        <checkBill>
-          <template v-slot:download="scope">
-            <el-button
-              v-if="tool.checkAuth($route.name, 'checkBillDetail')"
-              type="text"
-              size="mini"
-              @click="downLoadBill(scope.data)"
-              >{{ $t("单 据 下 载") }}</el-button
-            >
-          </template>
-        </checkBill>
       </div>
-      <div slot="slot2" v-if="mainData.actiontype != '工序模板'">
-        <teamList
-          v-if="tool.checkAuth($route.name, 'teamList') "
-          ref="teamList"
-          :data="mainData.team"
-          :status="mainData.status"
-        >
-          <selectTeam ref="team" @teamChange="teamChange" slot="add">
-            <el-button
-              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"
-              class="button-new-tag"
-              size="small"
-              type="primary"
-              @click="$refs.team.dialogFormVisible = true"
-              >{{ $t("添 加") }}</el-button
-            >
-          </selectTeam>
-        </teamList>
-      </div>
-      <div slot="slot3" v-if="mainData.actiontype != '工序模板'">
-        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+      <div slot="slot1">
+        <serviceWorkOrder ref="serviceWorkOrderRef" :data="mainData"></serviceWorkOrder>
       </div>
+<!--      <div slot="slot0" v-if="mainData.actiontype == '工序模板'">-->
+<!--        <taskDetail :data="nodes">-->
+<!--          <template v-slot:detail="scope">-->
+<!--            <taskListDetail-->
+<!--              class="inline-16"-->
+<!--              :data="scope.data"-->
+<!--            ></taskListDetail>-->
+<!--          </template>-->
+<!--          &lt;!&ndash; <template v-slot:edit="scope">-->
+<!--            <taskListEdit class="inline-16" :data="scope.data"/>-->
+<!--          </template> &ndash;&gt;-->
+<!--        </taskDetail>-->
+<!--      </div>-->
+<!--      <div slot="slot1" v-if="mainData.actiontype == '工序模板'">-->
+<!--        <checkBill ref="checkBillRef">-->
+<!--          <template v-slot:download="scope">-->
+<!--            <el-button-->
+<!--              v-if="tool.checkAuth($route.name, 'checkBillDetail')"-->
+<!--              type="text"-->
+<!--              size="mini"-->
+<!--              @click="downLoadBill(scope.data)"-->
+<!--              >{{ $t("单 据 下 载") }}</el-button-->
+<!--            >-->
+<!--          </template>-->
+<!--        </checkBill>-->
+<!--      </div>-->
+<!--      <div slot="slot2" v-if="mainData.actiontype == '工序模板'">-->
+<!--        <teamList-->
+<!--          v-if="tool.checkAuth($route.name, 'teamList')"-->
+<!--          ref="teamList"-->
+<!--          :data="mainData.team"-->
+<!--        >-->
+<!--          <selectTeam ref="team" @teamChange="teamChange" slot="add">-->
+<!--            <el-button-->
+<!--              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"-->
+<!--              class="button-new-tag"-->
+<!--              size="small"-->
+<!--              type="primary"-->
+<!--              @click="$refs.team.dialogFormVisible = true"-->
+<!--              >{{ $t("添 加") }}</el-button-->
+<!--            >-->
+<!--          </selectTeam>-->
+<!--        </teamList>-->
+<!--      </div>-->
+<!--      <div slot="slot3" v-if="mainData.actiontype == '工序模板'">-->
+<!--        <Items :data="mainData"></Items>-->
+<!--      </div>-->
+<!--      <div slot="slot4" v-if="mainData.actiontype == '工序模板'">-->
+<!--        <detailInfo :more="true" :data="detailInfo"></detailInfo>-->
+<!--      </div>-->
+
+<!--      <div slot="slot0" v-if="mainData.actiontype != '工序模板'">-->
+<!--        <Items :data="mainData"></Items>-->
+<!--      </div>-->
+<!--      <div slot="slot1" v-if="mainData.actiontype != '工序模板'">-->
+<!--        <checkBill>-->
+<!--          <template v-slot:download="scope">-->
+<!--            <el-button-->
+<!--              v-if="tool.checkAuth($route.name, 'checkBillDetail')"-->
+<!--              type="text"-->
+<!--              size="mini"-->
+<!--              @click="downLoadBill(scope.data)"-->
+<!--              >{{ $t("单 据 下 载") }}</el-button-->
+<!--            >-->
+<!--          </template>-->
+<!--        </checkBill>-->
+<!--      </div>-->
+<!--      <div slot="slot2" v-if="mainData.actiontype != '工序模板'">-->
+<!--        <teamList-->
+<!--          v-if="tool.checkAuth($route.name, 'teamList') "-->
+<!--          ref="teamList"-->
+<!--          :data="mainData.team"-->
+<!--          :status="mainData.status"-->
+<!--        >-->
+<!--          <selectTeam ref="team" @teamChange="teamChange" slot="add">-->
+<!--            <el-button-->
+<!--              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"-->
+<!--              class="button-new-tag"-->
+<!--              size="small"-->
+<!--              type="primary"-->
+<!--              @click="$refs.team.dialogFormVisible = true"-->
+<!--              >{{ $t("添 加") }}</el-button-->
+<!--            >-->
+<!--          </selectTeam>-->
+<!--        </teamList>-->
+<!--      </div>-->
+<!--      <div slot="slot3" v-if="mainData.actiontype != '工序模板'">-->
+<!--        <detailInfo :more="true" :data="detailInfo"></detailInfo>-->
+<!--      </div>-->
     </basicDetails>
   </div>
 </template>
@@ -191,6 +193,7 @@ import checkBill from "./checkBill/index";
 import teamList from "./teamList/index";
 import Items from "./items/index";
 import selectTeam from "../components/teamSelect";
+import serviceWorkOrder from '../modules/serviceWorkOrder/index'
 import { log } from "@antv/g2plot/lib/utils";
 export default {
   name: "detail",
@@ -201,7 +204,9 @@ export default {
       detailInfo: "",
       nodes: [],
       active_accoun:JSON.parse(sessionStorage.getItem('active_account')),
-      folderid:JSON.parse(sessionStorage.getItem('folderid'))
+      folderid:JSON.parse(sessionStorage.getItem('folderid')),
+      team_name:'',
+      team_phone_number:''
     };
   },
   components: {
@@ -213,6 +218,7 @@ export default {
     teamList,
     Items,
     selectTeam,
+    serviceWorkOrder
   },
   methods: {
     async queryMainData(id) {
@@ -223,10 +229,17 @@ export default {
         },
       });
       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.changeDataStructure();
-      console.log(res.data);
 
       this.nodes = this.createTreeData(res.data.nodes);
+      this.$refs.serviceWorkOrderRef.name = this.mainData.actiontype == '工序模板'?'工序详情':'服务商品'
       console.log(this.nodes);
     },
     downLoadBill(data) {
@@ -279,7 +292,7 @@ export default {
         },
         {
           label: "负责人",
-          value: this.mainData.projectleader,
+          value: this.team_name,
         },
         {
           label: "状态",
@@ -314,6 +327,52 @@ export default {
           label: "地址",
           value: this.mainData.address,
         },
+
+        {
+          label: "关联订单",
+          value: this.mainData.sonum,
+        },
+        {
+          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.team_phone_number,
+        },
+        {
+          label: "异常类型",
+          value: this.mainData.exception_type,
+        },
+        {
+          label: "服务等级",
+          value: this.mainData.service_level,
+        },
+        {
+          label: "项目名称",
+          value: this.mainData.projectname,
+        },
+
         {
           label: "创建时间",
           value: this.mainData.createdate,
@@ -331,7 +390,7 @@ export default {
         {
           title: "基本信息",
           info: [
-            { label: "单号", value: this.mainData.billno },
+            { label: "工单号", value: this.mainData.billno },
             { label: "申请单号", value: this.mainData.servicebillno },
             {
               label: "状态",
@@ -341,27 +400,63 @@ export default {
                 return style;
               },
             },
-            { label: "企业编号", value: this.mainData.agentnum },
-            { label: "企业名称", value: this.mainData.enterprise },
-            { label:'客诉大类',  value: this.mainData.class2},
-            { label:'申请原因',  value: this.mainData.reason},
-            { label: "服务联系人", value: this.mainData.scenecontact },
-            {
-              label: "联系人电话",
-              value: this.mainData.scenecontactphonenumber,
+            { label:'服务类型',value:this.mainData.servicetype,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.servicetype)
+                return style
+              }
             },
-            { label: "工单负责人", value: this.mainData.projectleader },
             { label: "工单类型", value: this.mainData.type },
-            { label: "工单模板", value: this.mainData.name },
+            { label:'关联订单',value:this.mainData.sonum},
+            { label: "企业名称", value: this.mainData.enterprise },
+            { label: "企业编号", value: this.mainData.agentnum },
+            { label: "项目名称", value: this.mainData.projectname},
             {
               label: "省市县",
               value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`,
             },
-            { label: "地址", value: this.mainData.address },
-            { label: "创建人", value: this.mainData.createby },
-            { label: "创建时间", value: this.mainData.createdate },
+            { label:'详细地址',value:this.mainData.address ? this.mainData.address : ''},
+            { 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.isout?'是':'否'},
+            { label:'服务负责人',value:this.team_name},
+            { label:'服务负责人电话',value:this.team_phone_number},
+            { label:'异常类型',value:this.exception_type},
+            { label: "业务员", value: this.mainData.saler_name},
+            { label: "业务员电话",value: this.mainData.salerphonenumber},
+            {
+              label: "服务等级",
+              value: this.mainData.service_level,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.service_level)
+                return style
+              }
+            },
+            { label: "确认客诉异常描述是否属实", value: this.mainData.isfact},
+            { label: "是否为我司出货产品",value: this.mainData.isouritem},
+            { label: "是否在保质期内", value: this.mainData.inqualityguaranteeperiod},
+            { label:'备注',  value: this.mainData.remarks},
           ],
         },
+        {
+          title:'系统信息',
+          info: [
+            {label:'创建时间',value:this.mainData.createdate},
+            {label:'最近编辑时间',value:this.mainData.changedate},
+            {label:'最近编辑人',value:this.mainData.changeby},
+
+            {label:'接单时间',value:this.mainData.takedate},
+            {label:'开始工单时间',value:this.mainData.startdate},
+            {label:'完成时间',value:this.mainData.finishdate},
+            {label:'中止时间',value:this.mainData.abortdate},
+            {label:'中止原因',value:this.mainData.abortreason},
+
+          ]
+        }
       ];
     },
     createTreeData(array) {

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

@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <el-tabs type="border-card" v-if="data.actiontype == '工序模板'">
+      <el-tab-pane label="工序详情" name="工序详情">工序详情</el-tab-pane>
+      <el-tab-pane label="工单物料" name="工单物料">工单物料</el-tab-pane>
+      <el-tab-pane label="服务确认单" name="服务确认单">服务确认单</el-tab-pane>
+      <el-tab-pane label="服务团队" name="服务团队">服务团队</el-tab-pane>
+      <el-tab-pane label="工单信息" name="工单信息">工单信息</el-tab-pane>
+    </el-tabs>
+    <el-tabs type="border-card" v-else>
+      <el-tab-pane label="服务商品" name="服务商品">服务商品</el-tab-pane>
+      <el-tab-pane label="服务确认单" name="服务确认单">服务确认单</el-tab-pane>
+      <el-tab-pane label="服务团队" name="服务团队">服务团队</el-tab-pane>
+      <el-tab-pane label="工单信息" name="工单信息">工单信息</el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  props:['data'],
+  data(){
+    return {
+      name:'工序详情'
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>