Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/serveBill/index.vue

@@ -12,7 +12,8 @@
       :options="options"
       :detailPath="{
         path:'/serveBillDetail'
-      }">
+      }"
+      @listData="list">
       <div slot="custom" style="display:flex">
         <div class="label_center">
           <label  class="search__label">状态:</label>
@@ -74,6 +75,9 @@ export default {
     }
   },
   methods:{
+    list (data) {
+      console.log(data)
+    },
     selectChange () {
       this.$refs.list.param.content.where = this.where
       this.$refs.list.listData()

src/HDrpManagement/serveBill/modules/detail.vue

@@ -63,7 +63,7 @@
             <el-button class="inline-16" v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" type="text" size="mini" @click="$refs.product.currentProduct=scope.data">编 辑</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_serviceorderid" @deleteSuccess="$refs.product.listData()"></delete-btn>
+            <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>
       </div>
@@ -113,7 +113,7 @@ export default {
       let that = this
       this.mainAreaData = [
         {label:'单号',value:this.mainData.billno ? this.mainData.billno : ''},
-        {label:'单据日期',value:this.mainData.billdate ? this.mainData.billno : ''},
+        {label:'单据日期',value:this.mainData.billdate ? this.mainData.billdate : ''},
         {label:'状态',value:this.mainData.status ? this.mainData.status : '',
           style:function () {
             let style = {}
@@ -144,16 +144,16 @@ export default {
           }  
         },
         {label:'经销商编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
-        {label:'经销商',value:this.mainData.enterprise ? this.mainData.enterprise : ''},
+        {label:'经销商',value:this.mainData.enterprisename ? this.mainData.enterprisename : ''},
         {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
-        {label:'服务分类',value:this.mainData.type ? this.mainData.type : ''},
+        {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : ''},
         {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.startdate ? this.mainData.startdate : ''},
+        {label:'需求服务开始日期',value:this.mainData.begdate ? this.mainData.begdate : ''},
         {label:'需求服务结束日期',value:this.mainData.enddate ? this.mainData.enddate : ''},
         {label:'申请原因',value:this.mainData.reason ? this.mainData.reason : ''},
         {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
@@ -166,17 +166,17 @@ export default {
             {label:'单据日期',value:this.mainData.billdate},
             {label:'状态',value:this.mainData.status},
             {label:'经销商编号',value:this.mainData.agentnum},
-            {label:'经销商',value:this.mainData.enterprise},
+            {label:'经销商',value:this.mainData.enterprisename},
             {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
             {label:'关联订单',value:this.mainData.sonum},
-            {label:'服务分类',value:this.mainData.type},
+            {label:'服务分类',value:this.mainData.servicetype},
             {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.startdate},
+            {label:'需求服务开始日期',value:this.mainData.begdate},
             {label:'需求服务结束日期',value:this.mainData.enddate},
             {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
           ]

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

@@ -85,7 +85,7 @@ export default {
             "sa_serviceorderid":this.$route.query.id,
             "iteminfos":[
                 {
-                  "sa_serviceorderitemsid": data.sa_serviceorderid, 
+                  "sa_serviceorderitemsid": data.sa_serviceorderitemsid, 
                   "itemid": data.itemid, 
                   "reason": data.reason
                 }

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -10,7 +10,7 @@
         idname="sa_workorderid"
         ownertable="sa_workorder"
         tags=""
-        :tabs="['工序详情','确认单','详细信息']"
+        :tabs="['工序详情','确认单','服务团队','工单物料','详细信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -98,7 +98,13 @@
           </template>
         </checkBill>
       </div>
-      <div slot="slot2" >
+      <div slot="slot2">
+        <teamList :data="mainData.team"></teamList>
+      </div>
+      <div slot="slot3">
+        <Items :data="mainData.titems"></Items>
+      </div>
+      <div slot="slot4" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
     </basicDetails>
@@ -111,6 +117,8 @@ import taskDetail from './taskDetail/index'
 import taskListDetail from './taskDetail/taskListDetail'
 import taskListEdit from './taskDetail/taskListEdit'
 import checkBill from './checkBill/index'
+import teamList from './teamList/index'
+import Items from './items/index'
 export default {
   name: "detail",
   data() {
@@ -126,7 +134,9 @@ export default {
     taskDetail,
     taskListDetail,
     taskListEdit,
-    checkBill
+    checkBill,
+    teamList,
+    Items
   },
   methods:{
     async queryMainData(id) {
@@ -138,7 +148,7 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
-      console.log(res.data.nodes);
+      console.log(res.data);
       
       this.nodes = this.createTreeData(res.data.nodes)
       console.log(this.nodes);
@@ -237,7 +247,7 @@ export default {
             {label:'经销商',value:this.mainData.enterprise},
             {label:'业务员',value:this.mainData.scenecontact},
             {label:'业务员电话',value:this.mainData.scenecontactphonenumber},
-            {label:'工单负责人',value:this.mainData.scenecontact},
+            {label:'工单负责人',value:this.mainData.projectleader},
             {label:'工单类型',value:this.mainData.type},
             {label:'工单模板',value:this.mainData.name},
             {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
@@ -246,24 +256,6 @@ export default {
             {label:'创建时间',value:this.mainData.createdate},
           ]
         },
-        {
-          title:'工单物料',
-          info: [
-            {label:'编码',value:this.mainData.billno},
-            {label:'名称',value:this.mainData.billdate},
-            {label:'型号',value:this.mainData.status},
-            {label:'规格',value:this.mainData.agentnum},
-            {label:'数量',value:this.mainData.enterprise},
-          ]
-        },
-        {
-          title:'确认单',
-          info: [
-            {label:'确认单号',value:this.mainData.billno},
-            {label:'创建时间',value:this.mainData.billdate},
-            {label:'状态',value:this.mainData.status},
-          ]
-        },
       ]
     },
     createTreeData (array) {

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

@@ -0,0 +1,69 @@
+
+<template>
+  <div>
+    <!-- <div style="display:flex;align-items:center">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="listData(params.content.pageNumber=1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div> -->
+    <div style="margin-top: 15px">
+      <el-table
+          ref="multipleTable"
+          :data="data"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="itemno"
+            label="编号">
+          </el-table-column>
+          <el-table-column
+            prop="itemname"
+            label="名称">
+          </el-table-column>
+          <el-table-column
+              prop="model"
+              label="型号">
+          </el-table-column>
+          <el-table-column
+              prop="spec"
+              label="规格">
+          </el-table-column>
+          <el-table-column
+              prop="qty"
+              label="数量">
+          </el-table-column>
+        </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:["data"],
+  data () {
+    return {
+      options:[
+      ],
+    }
+  },
+  methods:{
+  
+  },
+  created() {
+  }
+}
+
+</script>
+<style scoped>
+
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/taskListDetail.vue

@@ -25,7 +25,6 @@
             <el-descriptions-item label="文本信息" v-if="detailData.workpresetjson.textedit">{{ detailData.textcontent }}</el-descriptions-item>
             <el-descriptions-item label="附件" v-if="detailData.workpresetjson.fileupload"></el-descriptions-item>
         </el-descriptions>
-
         <file-item 
           v-if="detailData.workpresetjson.fileupload"
           :isDownLoad="true" 

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

@@ -0,0 +1,62 @@
+
+<template>
+  <div>
+    <!-- <div style="display:flex;align-items:center">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="listData(params.content.pageNumber=1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div> -->
+    <div style="margin-top: 15px">
+      <el-table
+          ref="multipleTable"
+          :data="data"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="name"
+            label="姓名">
+          </el-table-column>
+          <el-table-column
+            prop="phonenumber"
+            label="联系电话">
+          </el-table-column>
+          <el-table-column
+              prop="isleader"
+              label="角色">
+              <template slot-scope="scope">{{scope.row.isleader ? '服务主管' : '服务人员'}}</template>
+          </el-table-column>
+        </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:["data"],
+  data () {
+    return {
+      options:[
+      ],
+    }
+  },
+  methods:{
+  
+  },
+  created() {
+  }
+}
+
+</script>
+<style scoped>
+
+</style>

src/SManagement/orderclue/components/follow.vue

@@ -143,8 +143,8 @@ export default {
           "content": this.param
         })
         this.bindData = {
-          "ownertable": 'sa_workorder_confirmation',
-          "ownerid": 1,
+          "ownertable": 'sat_orderclue',
+          "ownerid": this.$route.query.id,
           "usetype": 'default',
         }
         this.loading = true