qymljy 2 mesi fa
parent
commit
e00a679de0

+ 10 - 4
src/HDrpManagement/serveWorkBill/components/generalTemplate.vue

@@ -96,7 +96,7 @@
     <div style="height: 10px;background: #f5f5f5"></div>
     <div style="margin: 10px;font-weight: bold;font-size: 16px">{{$t(`客户签字`)}}</div>
     <div class="drawer__panel" style="margin-bottom: 0 !important;">
-      <signature :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
+      <signature ref="signatureRef" :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
     </div>
     <div class="fixed__btn__panel">
       <el-button
@@ -200,6 +200,10 @@ export default {
       this.dataInfo = res.data
       this.setInputData()
       this.drawerVisible = true
+      this.$nextTick(()=>{
+        this.$refs.signatureRef.getField()
+      })
+
     },
     setInputData() {
       let that = this
@@ -297,10 +301,12 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
       // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew);
     },
   },
   mounted() {

+ 9 - 4
src/HDrpManagement/serveWorkBill/components/installationCommissioning.vue

@@ -121,7 +121,7 @@
       <div style="height: 10px;background: #f5f5f5"></div>
       <div style="margin: 10px;font-weight: bold;font-size: 16px">{{$t(`客户签字`)}}</div>
       <div class="drawer__panel" style="margin-bottom: -50px">
-        <signature :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
+        <signature ref="signatureRef" :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
       </div>
       <div class="fixed__btn__panel">
         <el-button
@@ -186,6 +186,9 @@ export default {
       this.dataInfo = res.data
       this.setInputData()
       this.drawerVisible = true
+      this.$nextTick(()=>{
+        this.$refs.signatureRef.getField()
+      })
     },
     setInputData() {
       let that = this
@@ -280,10 +283,12 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
       // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew);
     },
   },
   mounted() {

+ 9 - 4
src/HDrpManagement/serveWorkBill/components/installationTraining.vue

@@ -68,7 +68,7 @@
       <div style="height: 10px;background: #f5f5f5"></div>
       <div style="margin: 10px;font-weight: bold;font-size: 16px">{{$t(`客户签字`)}}</div>
       <div class="drawer__panel" style="margin-bottom: -50px">
-        <signature :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
+        <signature ref="signatureRef" :sa_workorder_confirmationid="sa_workorder_confirmationid" :sa_workorderid="sa_workorderid"></signature>
       </div>
       <div class="fixed__btn__panel">
         <el-button
@@ -130,6 +130,9 @@ export default {
       this.dataInfo = res.data
       this.setInputData()
       this.drawerVisible = true
+      this.$nextTick(()=>{
+        this.$refs.signatureRef.getField()
+      })
     },
     setInputData() {
       let that = this
@@ -206,10 +209,12 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
       // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew);
     },
   },
   mounted() {

+ 5 - 3
src/HDrpManagement/serveWorkBill/components/nonProcessTemplate.vue

@@ -261,10 +261,12 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
       // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew);
     },
   },
   mounted() {

+ 6 - 4
src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -256,10 +256,12 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
-      this.$refs.checkBillRef.listData()
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
+      // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew);
     },
     async teamChange(data) {
       let result = data.map((item) => {

+ 7 - 3
src/HDrpManagement/serveWorkBill/modules/serviceWorkOrder/index.vue

@@ -312,6 +312,7 @@ export default {
       return arr;
     },
     downLoadBill(data) {
+
       let result = data.attinfos.filter(
           (item) => item.usetype == "comfirmbill"
       );
@@ -321,10 +322,13 @@ export default {
       let ownerid = '&ownerid=' + data.sa_workorder_confirmationid
       let action = '&action=1'
       let urlNew = http + token + parentid + ownerid + action
-      if (result.length == 0)
-        window.open(urlNew);
-      window.open(result[result.length - 1].url, "_self");
+
+      // if (result.length == 0)
+      //   window.open(urlNew);
+      // window.open(result[result.length - 1].url, "_self");
       // this.$refs.checkBillRef.listData()
+
+      window.open(urlNew)
     },
     async teamChange(data) {
       let result = data.map((item) => {

+ 1 - 0
src/HDrpManagement/serveWorkBill/modules/signature/index.vue

@@ -488,6 +488,7 @@ export default {
           "usetype":"signature"//传空返回有所
         }
       })
+      console.log('获取附件信息','signature333')
       if (res.data.length > 0){
         const url = new URL(res.data[0].url)
         this.signatureData = url.origin + url.pathname