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

src/components/fee-info/main.vue

@@ -551,9 +551,14 @@ export default {
     //新增
     rowAdd() {
       if (this.inCropId) {
+        let corpName = ''
+        if (this.corpId){
+          corpName = this.corpList.find(item => this.corpId == item.id).cname;
+        }
         const params = {
           feesType: this.selectTab,
-          corpId: this.corpId
+          corpId: this.corpId?this.corpId:'',
+          corpName:this.corpId?corpName:''
         };
         if (this.typeName === "wood") params.corpId = this.corpId
         this.$refs.feeCrud.rowCellAdd(params);

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -248,6 +248,7 @@
           :data="bankOfDepositData"
           deleteUrl="/api/blade-deliver-goods/deliveryfiles/update"
           :enumerationValue="77"
+          display
         />
       </el-form>
     </div>

src/views/businessManagement/proxyOrder/detailsPageEdit.vue

@@ -460,6 +460,7 @@
           :data="bankOfDepositData"
           deleteUrl="/api/blade-client/corpsbank/update"
           :enumerationValue="77"
+          display
         />
 
       </el-form>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -257,6 +257,7 @@
           :data="bankOfDepositData"
           deleteUrl="/api/trade-purchase/purchase-order/removeByFiles"
           :enumerationValue="77"
+          display
         />
       </el-form>
     </div>

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -216,6 +216,7 @@
           :data="bankOfDepositData"
           deleteUrl="/api/blade-deliver-goods/deliveryfiles/update"
           :enumerationValue="77"
+          display
         />
       </el-form>
     </div>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -460,6 +460,7 @@
           :data="bankOfDepositData"
           deleteUrl="/api/blade-client/corpsbank/update"
           :enumerationValue="77"
+          display
         />
 
       </el-form>
@@ -2206,20 +2207,17 @@ export default {
     // 政策导入成功钩子
     successPolicy(res, file) {
       this.openFullScreen(true)
-      console.log(res)
       if (res.data.message === "" && !res.data.message) {
         this.dataPolicy = res.data.list? res.data.list: [];
         this.dataPolicy.forEach(item=>{
           this.$set(item, 'priceType', res.data.cname)
         })
-        console.log(this.dataPolicy)
         this.policyIndex++;
       } else {
         this.dataPolicy = res.data.list? res.data.list: [];
         this.dataPolicy.forEach(item=>{
           this.$set(item, 'priceType', res.data.cname)
         })
-        console.log(this.dataPolicy)
         this.policyIndex++;
         this.$message({
           showClose: true,

src/views/businessManagement/salesOrder/index.vue

@@ -633,8 +633,7 @@ export default {
       } else {
         let arr = [];
         this.openFullScreen(false, "正在生成客户收货...");
-        detail(row.id)
-          .then(res => {
+        detail(row.id).then(res => {
             arr = res.data.data.orderItemsList
               ? res.data.data.orderItemsList
               : [];
@@ -647,6 +646,7 @@ export default {
               cancelButtonText: "取消",
               type: "warning"
             }).then(() => {
+              this.openFullScreen(false, "正在生成客户收货...");
               res.data.data.orgId = res.data.data.id
               res.data.data.deliveryStatus = '录入'
               res.data.data.srcOrderNo = res.data.data.orgOrderNo
@@ -716,12 +716,11 @@ export default {
               delete res.data.data.belongToCorpList
               genClient(res.data.data).then(() => {
                 this.$message.success('客户收货成功')
+                this.openFullScreen(true);
                 this.onLoad(this.page, this.search);
               })
             });
-
-          })
-          .finally(() => {
+          }).finally(() => {
             this.openFullScreen(true);
           });
       }