2023-6-2

src/HDrpManagement/serveBillMag/components/changeBill.vue

@@ -5,6 +5,7 @@
       <div slot="title" style="font-size: 15px">
         <span style="margin-right:16px">转工单</span>
         <workProgress class="inline-16" />
+        <span>历史服务次数:{{ data.historicalservicesqty }}</span>
       </div>
       <div class="drawer__panel">
         <el-row :gutter="20">
@@ -50,6 +51,7 @@
 import workProgress from './workProgress'
 export default {
   name: "add",
+  props:['data'],
   components:{workProgress},
   data(){
     return {

src/HDrpManagement/serveBillMag/components/workProgress.vue

@@ -42,6 +42,13 @@
             label="需求服务结束时间"
             width="180">
           </el-table-column>
+          <el-table-column
+            label="操作"
+            width="180">
+            <template slot-scope="scope">
+              <el-button type="text" size="mini" @click="goDetail(scope.row)">详情</el-button>
+            </template>
+          </el-table-column>
         </el-table>
         <div style="margin-top:16px;text-align:right">
           <el-pagination
@@ -91,6 +98,12 @@ export default {
       this.currentPage = res.pageNumber
       console.log(this.tableData);
       
+    },
+    goDetail (data) {
+      let oldRoute = {path:this.$route.path,query:this.$route.query}
+      this.$store.dispatch('setHistoryRouter',oldRoute)
+      this.$router.replace({path:'/workorderDetail',query:{id:data.sa_workorderid}})
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -158,6 +158,8 @@ export default {
         {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.remarks ? this.mainData.remarks : ''},
       ]
       this.detailInfo = [

src/HDrpManagement/workReport/index.vue

@@ -28,7 +28,7 @@
             <Aside :statusParent="currentItem" ref="aside" @reportItem="reportItemClick"></Aside>
           </div>
           <div class="content-right">
-            <reportContent ref="reportContent"></reportContent>
+            <reportContent ref="reportContent" @deleteSuccess="deleteSuccess"></reportContent>
           </div>
         </div>
       </div>
@@ -76,6 +76,11 @@ export default {
     onSuccess (data) {
       this.$refs.aside.list.unshift(data)
       this.$refs.aside.itemClick(data)
+    },
+    deleteSuccess (id) {
+      let index = this.$refs.aside.list.findIndex(item => item.sys_workreportid == id)
+      this.$refs.aside.list.splice(index,1)
+      this.$refs.aside.list[index] ? this.$refs.aside.itemClick(this.$refs.aside.list[index]) : ''
     }
   },
   mounted () {

src/HDrpManagement/workReport/modules/reportContent/index.vue

@@ -3,17 +3,21 @@
     <div class="detail-header">
       <span>{{ detail.createby }}-{{ detail.reportname }}</span>
       <span>{{ detail.createdate }}</span>
+      <customBtn
+        class="inline-16"
+        btnName="删 除"
+        type="text"
+        size="small"
+        style="position:absolute;left:0;top:0"
+        message="确定删除当前汇报吗?"
+        idName="20230602105902"
+        keyName="sys_workreportid"
+        :id="id"
+        @onSuccess="$emit('deleteSuccess',id);id=''"
+        v-if="tool.checkAuth($route.name,'delete') && id"
+      />
     </div>
     <div class="detail-content" v-if="detail.items">
-      <!-- <div class="content-item" v-for="item in detail.items">
-        <p class="normal-title" style="margin-bottom:10px">{{ item.title }}</p>
-        <div v-if="item.content[0]">
-          <div v-for="(item2,index) in item.content[0].content" style="font-size:12px">
-            <span v-if="item2">{{ item2 }}</span>
-            <span style="font-size:12px;color:#cccccc" v-else>暂无</span>
-          </div>
-        </div>
-      </div> -->
       <div class="content-box"></div>
       <div class="kong"></div>
       <file-item 
@@ -30,18 +34,18 @@
 
 <script>
 import FileItem from '@/SManagement/orderclue/components/file/index2'
-import { P } from '@antv/g2plot'
-import { log } from '@antv/g2plot/lib/utils'
 export default {
   components:{FileItem},
   data () {
     return {
-      detail:{}
+      detail:{},
+      id:''
     }
   },
   methods: {
     async getDetail (id) {
       if (!id) return 
+      this.id = id
       let res = await this.$api.requested({
         "id": "20230524092002",
         "content": {
@@ -118,6 +122,7 @@ export default {
 .detail .detail-header {
   text-align: center;
   margin-bottom: 20px;
+  position: relative;
 }
 .detail .detail-header span:nth-of-type(2) {
   font-size: 12px;
@@ -131,6 +136,6 @@ export default {
 }
 .normal-title{
   font-size: 14px;
-  margin-bottom:10px
+  margin-bottom:10px;
 }
 </style>

src/components/customBtn/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :disabled="disabled ? disabled : false" :type="type ? type : 'primary'" size="mini" @click="submit">{{ btnName }}</el-button>
+    <el-button :disabled="disabled ? disabled : false" :type="type ? type : 'primary'" :size="size ? size : 'mini'" @click="submit">{{ btnName }}</el-button>
   </div>
 </template>
 
@@ -25,7 +25,8 @@ export default {
     dialog: Boolean,
     dialogTitle:String,
     dialogKey:String,
-    checkContent: Boolean
+    checkContent: Boolean,
+    size: String
   },
   data() {
     return {