服务工单、服务申请单、服务申请单管理,bug修复

src/HDrpManagement/serveBill/components/add.vue

@@ -413,7 +413,7 @@ export default {
           pageSize: 20,
           where: {
             condition: "",
-            type: 9,
+            type: 23,
           },
         },
       },

src/HDrpManagement/serveBill/modules/detail.vue

@@ -92,7 +92,7 @@
       </div>
       <div slot="slot1">
         <div v-if="tool.checkAuth($route.name,'linkedTicket')">
-          <serviceWorkOrder ref="serviceWorkOrderRef" v-if="mainData" :mainData="mainData" :nodes="nodes"
+          <serviceWorkOrder ref="serviceWorkOrderRef" v-if="mainData" :mainData="mainData" :nodes="nodes" type="隐藏"
                             :team_name="team_name" :team_phone_number="team_phone_number" :new-query="true"></serviceWorkOrder>
         </div>
         <div v-else>

src/HDrpManagement/serveBillMag/components/serviceApplication.vue

@@ -3,12 +3,12 @@
     <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="服务商品" name="服务商品" v-if="internalData.servicetype != '售前' && internalData.servicetype != '历史售后'">
         <productTable ref="product" :data="mainData" :newQuery="newQuery">
-          <addProduct v-if="tool.checkAuth($route.name,'serveProduct') && internalData.status == '新建'" slot="addProduct" :data="mainData" @onSuccess="$refs.product.listData()" />
+          <addProduct v-if="tool.checkAuth($route.name,'serveProduct') && internalData.status == '新建' && type != '隐藏'" 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') && internalData.status == '新建'" type="text" size="mini" @click="$refs.product.currentProduct=scope.data">{{$t('编 辑')}}</el-button>
+            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'serveProduct') && internalData.status == '新建' && type != '隐藏'" 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') && internalData.status == '新建'" nameKey="sa_serviceorderitemsids" :id="scope.data.sa_serviceorderitemsid" @deleteSuccess="$refs.product.listData()"></delete-btn>
+            <delete-btn nameId="20230206162003" v-if="tool.checkAuth($route.name,'serveProduct') && internalData.status == '新建' && type != '隐藏'" nameKey="sa_serviceorderitemsids" :id="scope.data.sa_serviceorderitemsid" @deleteSuccess="$refs.product.listData()"></delete-btn>
           </template>
         </productTable>
       </el-tab-pane>
@@ -30,7 +30,7 @@ import infoDetail from '@/components/InfoDetail/index'
 export default {
   name: "serviceApplication",
   components:{detailInfo,productTable,addProduct,infoDetail},
-  props:["mainData","newQuery"],
+  props:["mainData","newQuery","type"],
   data(){
     return {
       detailInfo:{},

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -75,7 +75,7 @@
       </div>
       <div slot="slot1">
         <div v-if="tool.checkAuth($route.name,'linkedTicket')">
-          <serviceWorkOrder ref="serviceWorkOrderRef" v-if="mainData" :mainData="mainData" :nodes="nodes"
+          <serviceWorkOrder ref="serviceWorkOrderRef" v-if="mainData" :mainData="mainData" :nodes="nodes" type="隐藏"
                             :team_name="team_name" :team_phone_number="team_phone_number" :new-query="true"></serviceWorkOrder>
         </div>
         <div v-else>

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

@@ -39,8 +39,8 @@
           <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname === 'operation' ? scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">
-          <el-button type="text" size="mini" @click="saveClick(scope.data)" :disabled="data.status != '进行中'" v-if="isEdit && scope.data.rowindex == nowRow">{{$t(`保存`)}}</el-button>
-          <el-button type="text" size="mini" @click="editClick(scope.data)" :disabled="data.status != '进行中'" v-else>{{$t(`编辑`)}}</el-button>
+          <el-button type="text" size="mini" @click="saveClick(scope.data)" :disabled="data.status != '进行中' || type == '隐藏'" v-if="isEdit && scope.data.rowindex == nowRow && type != '隐藏'">{{$t(`保存`)}}</el-button>
+          <el-button type="text" size="mini" @click="editClick(scope.data)" :disabled="data.status != '进行中' || type == '隐藏'" v-else>{{$t(`编辑`)}}</el-button>
         </template>
       </tableDetail>
       <div class="container normal-panel" style="text-align:right;margin-bottom: -10px!important;">
@@ -61,7 +61,7 @@
 
 <script>
 export default {
-  props: ["data"],
+  props: ["data","type"],
   data() {
     return {
       options: [],

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -132,7 +132,7 @@
       </div>
       <div slot="slot0">
         <div v-if="tool.checkAuth($route.name,'linkedApplication')">
-          <serviceApplication  ref="serviceApplicationRef" v-if="mainData" :mainData="mainData" :newQuery="true"></serviceApplication>
+          <serviceApplication  ref="serviceApplicationRef" v-if="mainData" :mainData="mainData" :newQuery="true" type="隐藏"></serviceApplication>
         </div>
         <div v-else>
           <serviceWorkOrder ref="serviceWorkOrderRef" v-if="mainData" :mainData="mainData" :nodes="nodes"

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

@@ -13,8 +13,8 @@
           @clear="listData(param.content.pageNumber = 1)"
           clearable>
       </el-input>
-       <add class="inline-16" v-if="isServer && (data.isServerMag || data.isleader) && data.status == '进行中'" btn-title="自服务申请单添加" drawer-title="自服务申请单添加" :param="serverAdd" :tablecols="tablecolsAdd" @addSuccess="addSuccess" :sa_workorderid="sa_workorderid"></add>
-       <add class="inline-16" v-if="(data.isServerMag || data.isleader) && data.status == '进行中'" btn-title="自产品档案添加" drawer-title="自产品档案添加" :param="productAdd" :tablecols="tablecolsAdd" @addSuccess="addSuccess" :sa_workorderid="sa_workorderid"></add>
+       <add class="inline-16" v-if="isServer && (data.isServerMag || data.isleader) && data.status == '进行中' && type != '隐藏'" btn-title="自服务申请单添加" drawer-title="自服务申请单添加" :param="serverAdd" :tablecols="tablecolsAdd" @addSuccess="addSuccess" :sa_workorderid="sa_workorderid"></add>
+       <add class="inline-16" v-if="(data.isServerMag || data.isleader) && data.status == '进行中' && type != '隐藏'" btn-title="自产品档案添加" drawer-title="自产品档案添加" :param="productAdd" :tablecols="tablecolsAdd" @addSuccess="addSuccess" :sa_workorderid="sa_workorderid"></add>
     </div>
     <div style="margin-top: 15px">
       <tableDetail :layout="tablecols" :data="list" :opwidth="200" :custom="true" fixed-name="operation" height="calc(100vh - 460px)">
@@ -41,9 +41,9 @@
           <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname === 'operation' ? scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">
-          <el-button type="text" size="mini" @click="saveClick(scope.data)" :disabled="data.status != '进行中'" v-if="isEdit && scope.data.rowindex == nowRow">{{$t(`保存`)}}</el-button>
-          <el-button type="text" size="mini" @click="editClick(scope.data)" :disabled="data.status != '进行中'" v-else>{{$t(`编辑`)}}</el-button>
-          <el-button type="text" size="mini" @click="delClick(scope.data)" :disabled="data.status != '进行中' || (!data.isServerMag && !data.isleader)">{{$t(`删除`)}}</el-button>
+          <el-button type="text" size="mini" @click="saveClick(scope.data)" :disabled="data.status != '进行中' || type == '隐藏'" v-if="isEdit && scope.data.rowindex == nowRow && type != '隐藏'">{{$t(`保存`)}}</el-button>
+          <el-button type="text" size="mini" @click="editClick(scope.data)" :disabled="data.status != '进行中' || type == '隐藏'" v-else>{{$t(`编辑`)}}</el-button>
+          <el-button type="text" size="mini" @click="delClick(scope.data)" :disabled="data.status != '进行中' || (!data.isServerMag && !data.isleader) || type == '隐藏'" v-if="type != '隐藏'">{{$t(`删除`)}}</el-button>
         </template>
       </tableDetail>
       <div class="container normal-panel" style="text-align:right;margin-bottom: -10px!important;" >
@@ -65,7 +65,7 @@
 <script>
 import add from '@/components/addTable/btnAdd'
 export default {
-  props: ["data","sa_workorderid"],
+  props: ["data","sa_workorderid","type"],
   components:{add},
   data() {
     return {

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

@@ -4,7 +4,7 @@
       <el-tab-pane label="工序详情" name="工序详情">
         <taskDetail :data="nodes" :nodesData="internalData" :newQuery="newQuery" ref="taskRefDetail">
           <template v-slot:edit="scope">
-            <edit class="inline-16" type="编辑" :data="scope.data" v-if="scope.data.parentid != 0 && scope.data.status != 1  && (internalData.isServerMag || internalData.isleader) && internalData.status == '进行中' && tool.checkAuth($route.name,'editProcess')"
+            <edit class="inline-16" type="编辑" :data="scope.data" v-if="scope.data.parentid != 0 && scope.data.status != 1  && (internalData.isServerMag || internalData.isleader) && internalData.status == '进行中' && tool.checkAuth($route.name,'editProcess') && type != '隐藏'"
                   :mainData="mainData" @saveSuccess="finishSuccess" ></edit>
           </template>
           <template v-slot:detail="scope">
@@ -17,10 +17,10 @@
         </taskDetail>
       </el-tab-pane>
       <el-tab-pane label="工单物料" name="工单物料">
-        <materials :data="mainData"></materials>
+        <materials :data="mainData" :type="type"></materials>
       </el-tab-pane>
       <el-tab-pane label="服务确认单" name="服务确认单">
-        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" type="隐藏">
+        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" :type="type">
           <template v-slot:download="scope">
             <el-button
                 type="text"
@@ -37,10 +37,11 @@
             ref="teamList"
             :data="internalData.team"
             :mainData="internalData"
+            :type="type"
         >
           <selectTeam ref="team" @teamChange="teamChange" slot="add">
             <el-button
-                v-if="(internalData.isServerMag || internalData.isleader) && internalData.status == '进行中'"
+                v-if="(internalData.isServerMag || internalData.isleader) && internalData.status == '进行中' && type != '隐藏'"
                 class="button-new-tag"
                 size="small"
                 type="primary"
@@ -56,10 +57,10 @@
     </el-tabs>
     <el-tabs type="border-card" v-model="activeName" v-else @tab-click="handleClick">
       <el-tab-pane label="工单服务商品" name="工单服务商品">
-        <Items ref="itemsRef" :data="internalData" :sa_workorderid="newQuery?mainData.sa_workorderid:$route.query.id"></Items>
+        <Items ref="itemsRef" :data="internalData" :sa_workorderid="newQuery?mainData.sa_workorderid:$route.query.id" :type="type"></Items>
       </el-tab-pane>
       <el-tab-pane label="服务确认单" name="服务确认单">
-        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" type="隐藏">
+        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" :type="type">
           <template v-slot:download="scope">
             <el-button
                 type="text"
@@ -76,10 +77,11 @@
             ref="teamList"
             :data="internalData.team"
             :mainData="internalData"
+            :type="type"
         >
           <selectTeam ref="team" @teamChange="teamChange" slot="add">
             <el-button
-                v-if="(internalData.isServerMag || internalData.isleader) && internalData.status == '进行中'"
+                v-if="(internalData.isServerMag || internalData.isleader) && internalData.status == '进行中' && type != '隐藏'"
                 class="button-new-tag"
                 size="small"
                 type="primary"
@@ -109,7 +111,7 @@ import materials from '../Materials/index'
 import edit from './modules/edit'
 export default {
   name: "index",
-  props:['mainData','nodes','newQuery'],
+  props:['mainData','nodes','newQuery','type'],
   components:{detailInfo,taskDetail,taskListDetail,taskListEdit,Items,checkBill,teamList,selectTeam,materials,edit},
   data(){
     return {

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

@@ -44,18 +44,20 @@
         <el-table-column :label="$t('操作')">
           <template slot-scope="scope">
             <el-button
-              :disabled="(mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader"
+              :disabled="(mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader || type == '隐藏'"
               class="inline-16"
               size="mini"
               type="text"
+              v-if="type != '隐藏'"
               @click="delPeople(scope.row)"
               >{{ $t("删 除") }}</el-button
             >
             <el-button
               :disabled="
-                (mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader
+                (mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader || type == '隐藏'
               "
               size="mini"
+              v-if="type != '隐藏'"
               type="text"
               @click="setLeader(scope.row)"
               >{{$t('设 置 负 责 人')}}</el-button
@@ -69,7 +71,7 @@
 
 <script>
 export default {
-  props: ["status","mainData"],
+  props: ["status","mainData","type"],
   data() {
     return {
       teamList: [],