服务改善 服务工单调整

src/HDrpManagement/serveWorkBill/components/acceptingOrders.vue

@@ -1,81 +1,36 @@
 <template>
   <div>
-    <el-button size="mini" :type="!data.isleader?'':'primary'" @click="checkBtn" :disabled="!data.isleader">{{
-        $t("接单")
-      }}</el-button>
-    <el-drawer
-        :title="$t(`接单确认信息`)"
-        append-to-body
-        :show-close="false"
-        :visible.sync="drawShow"
-        @close="onClose"
-        size="800px"
-    >
-      <div class="drawer__panel">
-        <el-row :gutter="20">
-          <el-form
-              :model="form"
-              :rules="rules"
-              ref="form"
-              :label-width="tool.onlyZh('140px')"
-              label-position="top"
-              size="mini"
-          >
-            <el-col :span="24">
-              <el-form-item :label="$t(`是否外包工单:`)" prop="isout">
-                <el-radio-group v-model="form.isout" @change="isoutChange">
-                  <el-radio :label="1">{{ $t("是") }}</el-radio>
-                  <el-radio :label="0">{{ $t("否") }}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.isout">
-              <el-form-item :label="$t(`服务负责人:`)" prop="isout">
-                <el-select v-model="form.userid" placeholder="请选择服务负责人" style="width: 100%" size="small" @change="nameChange">
-                  <el-option
-                      v-for="item in optionNames"
-                      :key="item.index"
-                      :label="item.username"
-                      :value="item.userid">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" v-if="form.isout">
-              <el-form-item :label="$t('服务负责人电话')" prop="phonenumber">
-                <el-input
-                    disabled
-                    v-model="form.phonenumber"
-                    :placeholder="$t(`服务负责人电话`)"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </el-row>
-      </div>
-      <div class="fixed__btn__panel">
-        <el-button
-            size="small"
-            @click="drawShow = false"
-            class="normal-btn-width"
-        >{{ $t("取 消") }}</el-button
+    <dialogTemplate @dialogShow="checkBtn" dialogTitle="接单" :disabled="!data.isleader" btnTitle="接单"
+                    btnType="primary" @onSubmit="onSubmit">
+      <template slot="formRule">
+        <el-form
+            :model="form"
+            :rules="rules"
+            ref="form"
+            :label-width="tool.onlyZh('140px')"
+            label-position="top"
+            size="mini"
         >
-        <el-button
-            size="small"
-            type="warning"
-            @click="onSubmit"
-            class="normal-btn-width btn-warning"
-        >{{ $t("确 定") }}</el-button
-        >
-      </div>
-    </el-drawer>
+          <el-col :span="24" style="margin-left: 220px">
+            <el-form-item :label="$t(`当前工单是否外包工单:`)" prop="isout">
+              <el-radio-group v-model="form.isout" @change="isoutChange">
+                <el-radio :label="1">{{ $t("是") }}</el-radio>
+                <el-radio :label="0">{{ $t("否") }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </template>
+    </dialogTemplate>
   </div>
 </template>
 
 <script>
+import dialogTemplate from '@/components/dialogTemplate/index2'
 export default {
   name: "acceptingOrders",
-  props:["data",'team_userid'],
+  props:["data",'team_userid','team_phone_number'],
+  components:{dialogTemplate},
   data(){
     return {
       drawShow:false,
@@ -83,7 +38,7 @@ export default {
         "sa_workorderid": this.$route.query.id,
         "isout":'', //是否外包
         "userid": this.team_userid, //1566
-        "phonenumber":""
+        "phonenumber":this.team_phone_number
       },
       rules:{
         isout: [
@@ -114,9 +69,10 @@ export default {
   },
   methods:{
     checkBtn(){
-      this.drawShow = true
-      this.form.isout = this.data.isout
-      this.queryPerson()
+      this.form.isout = 0
+      this.form.userid = this.team_userid
+      this.form.phonenumber = this.team_phone_number
+      console.log(this.form,'form2222')
     },
     onSubmit(){
       this.$refs.form.validate(async (valid) => {

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

@@ -14,7 +14,7 @@
         clearable
       >
       </el-input>
-      <add v-if="mainData.status == '进行中'" :mainData="mainData" @onSuccess="listData" :list="list" btnTitle="新 建" btnType="primary" :sa_workorderid="sa_workorderid"></add>
+      <add v-if="mainData.status == '进行中' && type != '隐藏'" :mainData="mainData" @onSuccess="listData" :list="list" btnTitle="新 建" btnType="primary" :sa_workorderid="sa_workorderid"></add>
     </div>
     <div style="margin-top: 15px">
       <tableLayout
@@ -46,8 +46,8 @@
         </template>
         <template v-slot:opreation="scope">
           <slot name="download" :data="scope.data"></slot>
-          <edit class="inline-16" btnTitle="编辑" btnType="text" v-if="mainData.status == '进行中' && scope.data.status == '新建'" :mainData="mainData" @onSuccess="listData" :list="list" :sa_workorderid="sa_workorderid"></edit>
-          <el-button type="text" size="mini" style="color: #67C23A" v-if="mainData.status == '进行中' &&  scope.data.status == '新建'" @click="submitClick(scope.data)">提交</el-button>
+          <edit class="inline-16" btnTitle="编辑" btnType="text" v-if="mainData.status == '进行中' && scope.data.status == '新建' && type != '隐藏'" :mainData="mainData" @onSuccess="listData" :list="list" :sa_workorderid="sa_workorderid"></edit>
+          <el-button type="text" size="mini" style="color: #67C23A" v-if="mainData.status == '进行中' &&  scope.data.status == '新建' && type != '隐藏'" @click="submitClick(scope.data)">提交</el-button>
           <!-- <printTable :data="scope.data">
 
           </printTable> -->
@@ -75,7 +75,7 @@ import printTable from "./printTable";
 import add from "./add"
 import edit from "./add"
 export default {
-  props: ["data","mainData","sa_workorderid"],
+  props: ["data","mainData","sa_workorderid","type"],
   components: { printTable,add,edit },
   data() {
     return {

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -40,7 +40,7 @@
             </div>
           </template>
         </transferWorkOrder>
-        <acceptingOrders :data="mainData" class="inline-16" v-if="mainData.status == '待接单'" :team_userid="team_userid" @onSuccess="queryMainData"></acceptingOrders>
+        <acceptingOrders :data="mainData" class="inline-16" v-if="mainData.status == '待接单'" :team_userid="team_userid" :team_phone_number="team_phone_number" @onSuccess="queryMainData"></acceptingOrders>
 <!--         <customBtn-->
 <!--          btnName="接单"-->
 <!--          message="确认接单当前服务工单吗?"-->

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

@@ -20,7 +20,7 @@
         <materials :data="mainData"></materials>
       </el-tab-pane>
       <el-tab-pane label="服务确认单" name="服务确认单">
-        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid">
+        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" type="隐藏">
           <template v-slot:download="scope">
             <el-button
                 type="text"
@@ -59,7 +59,7 @@
         <Items ref="itemsRef" :data="internalData" :sa_workorderid="newQuery?mainData.sa_workorderid:$route.query.id"></Items>
       </el-tab-pane>
       <el-tab-pane label="服务确认单" name="服务确认单">
-        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid">
+        <checkBill ref="checkBillRef" :mainData="internalData" :sa_workorderid="mainData.sa_workorderid" type="隐藏">
           <template v-slot:download="scope">
             <el-button
                 type="text"

src/HDrpManagement/serviceImprovement/components/actionImplementation/actionDetail.vue

@@ -17,17 +17,8 @@
             <span class="span margin-5">{{item.createdate}}</span>
           </div>
           <div style="display: flex;align-items: center">
-            <addRecord style="margin-left: 20px;" v-if="userid == data.userid_charge && mainData.status == '方案已发布' && data.status != '已完成'"
+            <addRecord style="margin-left: 20px;" class="inline-16" v-if="userid == data.userid_charge && mainData.status == '方案已发布' && data.status != '已完成'"
                        :data="data" @addSuccess="addSuccess" btn-type="text" btn-title="编辑" :content="item.record" :itemData="item"></addRecord>
-            <upload
-                class="inline-16"
-                ref="upload"
-                :folderid="folderid"
-                @onSuccess="onSuccess"
-                :id="item.sa_service_improvement_planid"
-                type="button">
-            </upload>
-<!--            <editFollow :data="item" @onSuccess="onSuccess" :disabled="disabled" v-if="!disabled && item.createuserid == userid"></editFollow>-->
             <el-button size="small" type="text" @click="onDel(item)" v-if="userid == data.userid_charge && mainData.status == '方案已发布' && data.status != '已完成'">
               {{$t(`删除`)}}</el-button>
           </div>

src/HDrpManagement/serviceImprovement/components/actionImplementation/addRecord.vue

@@ -27,10 +27,10 @@
             v-model="record">
         </el-input>
       </div>
-      <div style="height: 10px;background: #f1f2f3" v-if="btnTitle == '隐藏'"></div>
-      <div style="margin: 10px;font-weight: bold;" v-if="btnTitle == '隐藏'">{{$t(`上传附件`)}}</div>
-      <div class="drawer__panel" v-if="btnTitle == '隐藏'">
-        <uploadFile ref="upload"  :folderid="folderid" accept=".text,.doc,.xls"
+      <div style="height: 10px;background: #f1f2f3" v-if="btnType == '隐藏'"></div>
+      <div style="margin: 10px;font-weight: bold;" v-if="btnType == '隐藏'">{{$t(`上传附件`)}}</div>
+      <div class="drawer__panel" v-if="btnType == '隐藏'">
+        <uploadFile ref="upload"  :folderid="folderid"
                     :bindData="{ownertable:'sa_service_improvement_record',ownerid:sa_service_improvement_recordid,usetype:'default'}"
                     @onSuccess="uploadSuccess" :id="data.sa_service_improvement_recordid"></uploadFile>
         <fileTable ref="list" style="margin-top: 20px;" :id="sa_service_improvement_recordid"></fileTable>
@@ -67,19 +67,28 @@ export default {
     onShow(){
       this.drawerShow = true
       this.list[0] = this.data
+      this.listFiles = []
       if (this.btnTitle == '编辑'){
         this.sa_service_improvement_recordid = this.itemData.sa_service_improvement_recordid
       }else {
-        this.sa_service_improvement_recordid = 9999999999
+        this.sa_service_improvement_recordid = 99999999999
       }
       this.record = this.content
+      this.$refs.list.listData()
+      this.$nextTick(()=>{
+        let listFiles = this.$refs.list.list
+        console.log(listFiles,4444)
+      })
     },
     uploadSuccess(res){
       console.log(res.data,'附件列表')
       this.$refs['upload'].dialogUploadVisible = false
       this.$refs.list.listData()
-      let listFiles = this.$refs.list.list
-      console.log(listFiles,4444)
+      this.$nextTick(()=>{
+        let listFiles = this.$refs.list.list
+        console.log(listFiles,4444)
+      })
+
       /*if(typeof res.attinfos == 'string') {
          this.$refs.list.listData()
       } else {
@@ -102,10 +111,10 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        // if (this.btnTitle != '编辑'){
-        //   this.listFiles = this.$refs.list.list
-        //   this.batchBinding(res.data)
-        // }
+        if (this.btnTitle != '编辑'){
+          // this.listFiles = this.$refs.list.list
+          // this.batchBinding(res.data.sa_service_improvement_recordid)
+        }
         this.drawerShow = false
         this.$emit('addSuccess',this.data.sa_service_improvement_planid)
       })