修改bug

src/api/tradeAgency/oceanFreightImport.js

@@ -310,4 +310,13 @@ export const getListTradeV1= (current, size,data) => {
             size
         }
     })
-}
+}
+
+//退押or撤销退押
+export const retreatPledge= (data) => {
+    return request({
+        url: '/api/blade-los/tradebills/retreatPledge',
+        method: 'get',
+        params: data
+    })
+}

src/views/iosBasicData/ComputationCenter/index.vue

@@ -94,7 +94,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -1029,6 +1029,10 @@ export default {
     text-align: center;
 }
 
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
+
 
 .pointerClick {
     cursor: pointer;

src/views/iosBasicData/finstlbills/index.vue

@@ -98,7 +98,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 18,
           border: true,
           index: true,
           viewBtn: true,

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -631,7 +631,7 @@ export default {
           cell: true
         }]
       },
-
+      userObj:{},
         dialogVisibleED:false, // 额度弹窗的开启
     }
   },
@@ -666,6 +666,7 @@ export default {
     this.getCorpType()
     this.getAllWorkDicts()
     this.getCorpTypeCk()
+    this.userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
 
   },
   activated() {
@@ -1056,7 +1057,11 @@ export default {
         if (row.tel) {
             if (!row.userId) {
                 this.dialogVisibleBt = true;
-                this.formDataTwo = {};
+                this.formDataTwo = {
+                  roleId:[ "1658417787548205058" ],
+                  postId:[ "1742709504333688834" ],
+                  deptId:[this.userObj.dept_id]
+                };
                 this.formRow = row;
             }else {
                 this.$message.error("已经存在用户,请勿重复创建");

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -9,7 +9,7 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.sysNo }}
           </span>
         </template>
-        <template slot-scope="{ row, index }" slot="corpId">
+        <template slot-scope="{ row, index }" slot="corpName">
           <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.corpName }}
           </span>
         </template>
@@ -18,9 +18,9 @@
           <el-button :size="size" :type="type" :disabled="row.financeStatus == '已收款' || item >= 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
-        <template slot="corpNameSearch">
+        <!-- <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
-        </template>
+        </template> -->
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
@@ -78,56 +78,49 @@ export default {
         column: [{
           label: '单据编号',
           prop: "sysNo",
-          searchOrder:3,
+          searchOrder: 3,
           search: true,
           overHidden: true,
         }, {
           label: '合同号',
           prop: "contractNumber",
-          searchOrder:4,
+          searchOrder: 4,
           search: true,
           overHidden: true,
         }, {
           label: "客户",
-          prop: "corpId",
+          prop: "corpName",
           search: true,
-          remote:true,
-          searchOrder:1,
+          // remote: true,
+          filterable:true,
+          searchOrder: 1,
           type: 'select',
+          overHidden: true,
           props: {
             label: 'cname',
-            value: 'id'
+            value: 'cname'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH',
-            change: (row, column, value) => {
-                console.log(row,132)
-                console.log(column,133)
-                column[1].searchValue = value;
-                this.$refs.crud.dicInit()
-            },
-          // click: (e) => {
-          //   this.$refs.crud.dicInit()
-          // },
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
         }, {
-            label: "结算日期",
-            prop: "settlementDate",
-            searchProp: "settlementDateList",
-            searchOrder:2,
-            type: "date",
-            search:true,
-            overHidden: true,
-            width: 100,
-            searchRange: true,
-            unlinkPanels: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          label: "结算日期",
+          prop: "settlementDate",
+          searchProp: "settlementDateList",
+          searchOrder: 2,
+          type: "date",
+          search: true,
+          overHidden: true,
+          width: 100,
+          searchRange: true,
+          unlinkPanels: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: "所属公司",
           prop: "salesCompanyId",
           search: true,
           type: 'select',
-          searchOrder:6,
+          searchOrder: 6,
           props: {
             label: 'fullName',
             value: 'id'
@@ -136,7 +129,7 @@ export default {
         }, {
           label: '账户',
           prop: "accountName",
-          searchOrder:4,
+          searchOrder: 4,
           search: true,
           overHidden: true,
           type: 'select',
@@ -164,11 +157,11 @@ export default {
             value: "id"
           },
           dicUrl: "/api/blade-user/client/gainUser",
-        },{
+        }, {
           label: '状态',
           prop: "financeStatus",
           search: true,
-          searchOrder:5,
+          searchOrder: 5,
           overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=put_Status",
@@ -181,7 +174,7 @@ export default {
           label: "制单日期",
           prop: "createTime",
           // searchProp: "settlementDateList",
-          searchOrder:5,
+          searchOrder: 5,
           type: "date",
           // search:true,
           overHidden: true,
@@ -284,8 +277,8 @@ export default {
       });
     },
     searchChange(params, done) {
-        // console.log(params,285)
-        this.page.currentPage = 1;
+      // console.log(params,285)
+      this.page.currentPage = 1;
       done();
       this.onLoad(this.page, params)
     },

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -10,7 +10,7 @@
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                     <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.orderStatus != '录入'">删除</el-button>
+                        :disabled="row.orderStatus != '录入'||row.firstStatus=='审核通过'">删除</el-button>
                 </template>
                 <template slot="businessNo" slot-scope="{ row }">
                     <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.businessNo }}</span>
@@ -124,8 +124,8 @@ export default {
                             label: '审核中',
                             value: '审核中'
                         }, {
-                            label: '已结算',
-                            value: '已结算'
+                            label: '已确认',
+                            value: '已确认'
                         }],
                         overHidden: true,
                     },

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -28,6 +28,10 @@
                     </el-button>
                     <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制订单
                     </el-button>
+                    <el-button type="warning" size="small" :disabled="selectionList.length == 0" @click="allClick('退押')">退押
+                    </el-button>
+                    <el-button type="info" size="small" :disabled="selectionList.length == 0" @click="allClick('撤销退押')">撤销退押
+                    </el-button>
                     <!-- <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button> -->
                 </template>
@@ -46,7 +50,7 @@
 </template>
   
 <script>
-import { getList, remove, copyAgent } from "@/api/tradeAgency/oceanFreightImport";
+import { getList, remove, retreatPledge } from "@/api/tradeAgency/oceanFreightImport";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
 import { getWorkDicts } from "@/api/system/dictbiz";
@@ -426,6 +430,46 @@ export default {
         }, 100);
     },
     methods: {
+        allClick(name) {
+            if (name == '退押') {
+                let ids = []
+                for (let item of this.selectionList) {
+                    ids.push(item.id)
+                    if (item.billingStatus == 1) return this.$message.error('第' + Number(item.$index + 1) + '行不能退押');
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                retreatPledge({ ids: ids.join(','), type: 1 }).then(res => {
+                    this.$message.success("操作成功");
+                    this.onLoad(this.page, this.query);
+                }).finally(() => {
+                    loading.close()
+                })
+            }
+            if (name == '撤销退押') {
+                let ids = []
+                for (let item of this.selectionList) {
+                    ids.push(item.id)
+                    if (item.billingStatus == 0) return this.$message.error('第' + Number(item.$index + 1) + '行不能撤销退押');
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                retreatPledge({ ids: ids.join(','), type: 2 }).then(res => {
+                    this.$message.success("操作成功");
+                    this.onLoad(this.page, this.query);
+                }).finally(() => {
+                    loading.close()
+                })
+            }
+        },
         handleCheckedChange() {
             delete this.query.whetherSail
             delete this.query.whetherReachHarbor