Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/change-approve/main.vue

@@ -35,8 +35,8 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="sendHandle">发送</el-button>
-      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" @click="sendHandle" :loading="buttonLoading">发送</el-button>
+      <el-button @click="closeDialog" :loading="buttonLoading">取消</el-button>
     </span>
   </el-dialog>
 </template>
@@ -54,6 +54,11 @@ export default {
     url: {
       type: String
     },
+    // 路由地址 用于关闭页面
+    routerTag: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
@@ -67,6 +72,7 @@ export default {
         auditUserId: [{required: true, message: " ", trigger: "change"}],
         // messageBody: [{required: true, message: " ", trigger: "blur"}],
       },
+      buttonLoading: false,
     }
   },
   created() {
@@ -89,10 +95,22 @@ export default {
     sendHandle() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.buttonLoading = true;
           changeApprove(this.url, {...this.form, id: this.auditId}).then(res => {
+            this.$message.success('修改成功')
             this.closeDialog()
-            this.$router.$avueRouter.closeTag();
-            this.$router.push({path: `/approveData/index`});
+            if (this.routerTag !== '') {
+              this.$router.$avueRouter.closeTag(this.routerTag);
+            }
+            this.$router.$avueRouter.closeTag('/approveData/index');
+            this.$router.push({
+              path: `/approveData/index`,
+              query: {
+                check: 'refresh'
+              },
+            });
+          }).finally(() => {
+            this.buttonLoading = false;
           })
         }
       })

src/views/businessManagement/purchaseOrder/index.vue

@@ -70,7 +70,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
-            :disabled="scope.row.item.length == 0 || scope.row.createFreight == 1"
+            :disabled="(scope.row.itemsList && scope.row.itemsList.length == 0) || scope.row.createFreight == 1"
           >删除
           </el-button>
         </template>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -790,6 +790,7 @@
       @closeDialog="closeChangeApprove"
       :auditId="detailData.auditId"
       url="/api/blade-check/auditproecess/changeAuditUser"
+      :routerTag="routerTag"
     />
   </div>
 </template>
@@ -1657,6 +1658,7 @@ export default {
       shopQualityDisable: false, //质量胎切换禁用
       index: 0,
       policyIndex: 0,
+      routerTag: '',
     }
   },
   mounted() {
@@ -1665,6 +1667,7 @@ export default {
       window.onresize = () => {
         this.rowHeight = (window.innerHeight - 130) + 'px'
       }
+      this.routerTag = window.location.hash.slice(1);
     })
   },
   filters: {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -129,7 +129,7 @@
             </el-button>
           </template>
           <template slot="srcOrderno" slot-scope="scope">
-            <span style="color: #409EFF;cursor: pointer" @click="jumpPage(scope.row, index)">{{scope.row.srcOrderno}}</span>
+            <span style="color: #409EFF;cursor: pointer" @click="jumpPage(scope.row, scope.index)">{{scope.row.srcOrderno}}</span>
           </template>
           <template slot-scope="{ row }" slot="currency">
             <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable filterable>

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -162,6 +162,9 @@
             >删除
             </el-button>
           </template>
+          <template slot="srcOrderno" slot-scope="scope">
+            <span style="color: #409EFF;cursor: pointer" @click="jumpPage(scope.row, scope.index)">{{scope.row.srcOrderno}}</span>
+          </template>
         </avue-crud>
       </basic-container>
       <el-dialog