修改bug

src/api/tirePartsMall/purchasingManagement/warehouseEntryOrder.js

@@ -89,4 +89,16 @@ export const getGoodsInfo = (query) => {
     method: 'get',
     params: query
   })
+}
+
+export const getParamservice = (current, size, params) => {
+  return request({
+    url: '/api/blade-system/paramservice/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
 }

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -250,4 +250,32 @@ export const generateReturns = (params) => {
     method: 'get',
     params: params
   })
+}
+export const confirmWarehouse = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/confirmWarehouse',
+    method: 'POST',
+    data: data
+  })
+}
+export const revokeWarehouse = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/revokeWarehouse',
+    method: 'POST',
+    data: data
+  })
+}
+export const confirmRedeem = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/confirmRedeem',
+    method: 'POST',
+    data: data
+  })
+}
+export const revokeRedeem = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/revokeRedeem',
+    method: 'POST',
+    data: data
+  })
 }

src/util/date.js

@@ -43,7 +43,7 @@ export function dateFormat(date, format) {
       if (new RegExp("(" + k + ")").test(format))
         format = format.replace(RegExp.$1,
           RegExp.$1.length === 1 ? o[k] :
-          ("00" + o[k]).substr(("" + o[k]).length));
+            ("00" + o[k]).substr(("" + o[k]).length));
     return format;
   }
   return '';
@@ -66,17 +66,17 @@ export function defaultDate(type) {
       dateFormat(startDate, "yyyy-MM-dd"),
       dateFormat(endDate, "yyyy-MM-dd")
     ];
-  }else if (type == 3){
-    return[
-      dateFormat(new Date(date.getFullYear(), date.getMonth()-1, 1), "yyyy-MM-dd"),
-      dateFormat(new Date((date.getMonth() + 1) === 12?date.getFullYear()+1:date.getFullYear(), (date.getMonth() + 1), date.getDate()), "yyyy-MM-dd")
+  } else if (type == 3) {
+    return [
+      dateFormat(new Date(date.getFullYear(), date.getMonth() - 1, 1), "yyyy-MM-dd"),
+      dateFormat(new Date((date.getMonth() + 1) === 12 ? date.getFullYear() + 1 : date.getFullYear(), (date.getMonth() + 1), date.getDate()), "yyyy-MM-dd")
     ];
-  } else if (type == 4){
-    return[
+  } else if (type == 4) {
+    return [
       dateFormat(new Date(date.getFullYear(), date.getMonth(), 1), "yyyy-MM-dd"),
       dateFormat(new Date(date.getFullYear(), date.getMonth() + 1, 0), "yyyy-MM-dd")
     ];
-  }else {
+  } else {
     return [
       dateFormat(startDate, "yyyy-MM-dd") + " 00:00:00",
       dateFormat(endDate, "yyyy-MM-dd") + " 23:59:59"
@@ -87,7 +87,7 @@ export function defaultDate(type) {
  * 获取当天
  * [yyyy-MM-dd,yyyy-MM-dd]
  */
- export function defaultDate2() {
+export function defaultDate2() {
   const date = new Date();
   return [
     dateFormat(date, "yyyy-MM-dd"),
@@ -101,7 +101,7 @@ export function defaultDate(type) {
 export function defaultDate3() {
   const date = new Date();
   const startDate = new Date(date.getFullYear(), date.getMonth(), 1);
-  const endDate = new Date(date.getFullYear(), date.getMonth()+1, 0);
+  const endDate = new Date(date.getFullYear(), date.getMonth() + 1, 0);
   return [
     dateFormat(startDate, "yyyy-MM-dd"),
     dateFormat(endDate, "yyyy-MM-dd")
@@ -122,21 +122,21 @@ export function startDate() {
  */
 export function endDate() {
   const date = new Date();
-  const endDate = new Date(date.getFullYear(), date.getMonth()+1, 0);
+  const endDate = new Date(date.getFullYear(), date.getMonth() + 1, 0);
   return dateFormat(endDate, "yyyy-MM-dd");
 }
 /**
  * 获取当年
  * [yyyy-MM-dd,yyyy-MM-dd]
  */
- export function defaultDate4() {
+export function defaultDate4() {
   const date = new Date();
   return dateFormat(date, "yyyy");
 }
 /**
  * 获取本年上个月
  */
-export function CurrentMonth(date,format = 'yyyy-MM-dd hh:mm:ss') {
+export function CurrentMonth(date, format = 'yyyy-MM-dd hh:mm:ss') {
   format = format || 'yyyy-MM-dd hh:mm:ss';
   if (date !== 'Invalid Date') {
     let o = {
@@ -168,9 +168,9 @@ export function CurrentMonth(date,format = 'yyyy-MM-dd hh:mm:ss') {
  * 获取上月第一天和上月最后一天
  * [yyyy-MM-dd,yyyy-MM-dd]
  */
- export function defaultDate5() {
+export function defaultDate5() {
   const date = new Date();
-  const startDate = new Date(date.getFullYear(), date.getMonth()-1, 1);
+  const startDate = new Date(date.getFullYear(), date.getMonth() - 1, 1);
   const endDate = new Date(date.getFullYear(), date.getMonth(), 0);
   return [
     dateFormat(startDate, "yyyy-MM-dd") + " 00:00:00",
@@ -187,7 +187,7 @@ export function getCurrentDate(type = 'dateTime') {
     return dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
   }
 }
-export function getYearDate(){
+export function getYearDate() {
   const date = new Date();
   return date.getFullYear()
 }
@@ -214,3 +214,8 @@ function addZero(num) {
   }
   return num;
 }
+
+export function verifyEnglish(str) {
+  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*]+$/;
+  return regex.test(str?str:null);
+}

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -271,6 +271,7 @@ import DocumentCenter from "@/views/iosBasicData/AirtransportExport/bills/assemb
 import businessReports from "@/views/iosBasicData/AirtransportExport/bills/assembly/businessReports.vue";
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
+import { verifyEnglish } from "@/util/date";
 import { editypesList } from "@/api/iosBasicData/editypes";
 import {
     aeabillsCheckBills,
@@ -1324,6 +1325,32 @@ export default {
                         })
                         return;
                     }
+                    let msgsList = []
+                    if (!verifyEnglish(this.form.hshipperDetails)) {
+                        msgsList.push('发货人')
+                    }
+                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                        msgsList.push('收货人')
+                    }
+                    if (!verifyEnglish(this.form.hnotifyDetails)) {
+                        msgsList.push('通知人')
+                    }
+                    if (!verifyEnglish(this.form.marks)) {
+                        msgsList.push('唛头')
+                    }
+                    if (!verifyEnglish(this.form.commodityDescr)) {
+                        msgsList.push('货描')
+                    }
+                    if (!verifyEnglish(this.form.remarks)) {
+                        msgsList.push('备注')
+                    }
+                    if (!verifyEnglish(this.form.cyRemarks)) {
+                        msgsList.push('场站备注')
+                    }
+                    if (msgsList.length > 0) {
+                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                        return;
+                    }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -273,6 +273,7 @@ import businessReports from "@/views/iosBasicData/AirtransportImport/bills/assem
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
+import { verifyEnglish } from "@/util/date";
 import {
     aeabillsCheckBills,
     aeabillsCopyBills,
@@ -1319,6 +1320,32 @@ export default {
                         })
                         return;
                     }
+                    let msgsList = []
+                    if (!verifyEnglish(this.form.hshipperDetails)) {
+                        msgsList.push('发货人')
+                    }
+                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                        msgsList.push('收货人')
+                    }
+                    if (!verifyEnglish(this.form.hnotifyDetails)) {
+                        msgsList.push('通知人')
+                    }
+                    if (!verifyEnglish(this.form.marks)) {
+                        msgsList.push('唛头')
+                    }
+                    if (!verifyEnglish(this.form.commodityDescr)) {
+                        msgsList.push('货描')
+                    }
+                    if (!verifyEnglish(this.form.remarks)) {
+                        msgsList.push('备注')
+                    }
+                    if (!verifyEnglish(this.form.cyRemarks)) {
+                        msgsList.push('场站备注')
+                    }
+                    if (msgsList.length > 0) {
+                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                        return;
+                    }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.eta ? this.form.eta.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -301,6 +301,7 @@ import businessReports from "@/views/iosBasicData/OceanFreightImport/bills/assem
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
+import { verifyEnglish } from "@/util/date";
 export default {
     components: {
         checkSchedule,
@@ -1342,6 +1343,32 @@ export default {
                         })
                         return;
                     }
+                    let msgsList = []
+                    if (!verifyEnglish(this.form.hshipperDetails)) {
+                        msgsList.push('发货人')
+                    }
+                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                        msgsList.push('收货人')
+                    }
+                    if (!verifyEnglish(this.form.hnotifyDetails)) {
+                        msgsList.push('通知人')
+                    }
+                    if (!verifyEnglish(this.form.marks)) {
+                        msgsList.push('唛头')
+                    }
+                    if (!verifyEnglish(this.form.commodityDescr)) {
+                        msgsList.push('货描')
+                    }
+                    if (!verifyEnglish(this.form.remarks)) {
+                        msgsList.push('备注')
+                    }
+                    if (!verifyEnglish(this.form.cyRemarks)) {
+                        msgsList.push('场站备注')
+                    }
+                    if (msgsList.length > 0) {
+                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                        return;
+                    }
                     // 赋值 ETA 日期
                     this.form.billDate = this.form.eta ? this.form.eta.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -326,6 +326,7 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
+import { verifyEnglish } from "@/util/date";
 export default {
     components: {
         checkSchedule,
@@ -960,7 +961,7 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName, status: 0 }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
                 this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
                     item.cnName = item.cnName + ' - ' + item.shortName
                     return item
@@ -1525,6 +1526,42 @@ export default {
                         })
                         return;
                     }
+                    let msgsList = []
+                    if (!verifyEnglish(this.form.hshipperDetails)) {
+                        msgsList.push('发货人')
+                    }
+                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                        msgsList.push('收货人')
+                    }
+                    if (!verifyEnglish(this.form.hnotifyDetails)) {
+                        msgsList.push('通知人')
+                    }
+                    if (!verifyEnglish(this.form.marks)) {
+                        msgsList.push('唛头')
+                    }
+                    if (!verifyEnglish(this.form.commodityDescr)) {
+                        msgsList.push('货描')
+                    }
+                    if (!verifyEnglish(this.form.bookingRemarks)) {
+                        console.log(this.form.bookingRemarks,verifyEnglish(this.form.bookingRemarks),1111111)
+                        msgsList.push('订舱备注')
+                    }
+                    if (!verifyEnglish(this.form.siRemarks)) {
+                        msgsList.push('SI备注')
+                    }
+                    if (!verifyEnglish(this.form.forwarding)) {
+                        msgsList.push('FORWARDING')
+                    }
+                    if (!verifyEnglish(this.form.remarks)) {
+                        msgsList.push('备注')
+                    }
+                    if (!verifyEnglish(this.form.cyRemarks)) {
+                        msgsList.push('场站备注')
+                    }
+                    if (msgsList .length > 0) {
+                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                        return;
+                    }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口
@@ -2030,7 +2067,7 @@ export default {
             if (this.form.corpCnName) {
                 getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
                     res.data.data.records.forEach(e => {
-                        if (this.form.corpCnName == e.cnName){
+                        if (this.form.corpCnName == e.cnName) {
                             this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                         }
                     })

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -17,11 +17,6 @@
                     :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待收货'" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
-                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
-                    :disabled="form.status != '已收货' || form.returnsNumber == form.goodsTotalNum || editButton"
-                    @click="getReturns">
-                    采购退货
-                </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">
                     <el-button v-show="!(!form.id || viewDisabled)" type="danger" :loading="buttonLoading"
                         :disabled="!form.id || viewDisabled" size="small">
@@ -76,6 +71,11 @@
                                 :value="item.belongtoarea + item.detailedAddress" />
                         </el-select>
                     </template>
+                    <tempalte slot="fundingPartyName" slot-scope="{ row }">
+                        <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname" res="records"
+                            url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true" :remote="true"
+                            dataName="cname" @selectChange="dicChange('fundingPartyName', $event)" :disabled="editButton"></dic-select>
+                    </tempalte>
                 </avue-form>
             </trade-card>
             <trade-card title="明细信息">
@@ -319,7 +319,7 @@ import {
     goodsListAll,
     shortcutWarehousing
 } from "@/api/tirePartsMall/salesManagement/saleOrder";
-import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
+import { dotList, goodsDetail, getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
 import checkSchedule from "@/components/checkL/checkSchedule";
 import check from "@/components/checkL/check";
@@ -330,6 +330,7 @@ import da from "element-ui/src/locale/lang/da";
 import { number } from "echarts";
 import { getDeptLazyTreeTwo } from "@/api/basicData/basicFeesDesc";
 import commodity from "../../configuration/commodity.json";
+import dicSelect from "@/components/dicSelect/main";
 export default {
     name: "detailsPage",
 
@@ -455,6 +456,7 @@ export default {
             },
             templateUrl: '/api/blade-sales-part/ship/export-item', // 模板url
             form: {
+                whetherFinancing: 0,
                 orderItemsList: [],
                 paymentRecordsList: [],
                 outboundRecordsList: []
@@ -657,18 +659,43 @@ export default {
                     label: '单据编号',
                     prop: "ordNo",
                     disabled: true
-                }, {
-                    label: '退货数量',
-                    prop: "returnsNumber",
-                    disabled: true
-                }, {
-                    label: '退货金额',
-                    prop: "returnsAmount",
-                    disabled: true
                 },
                 {
                     label: '资金方',
                     prop: "fundingPartyName",
+                    disabled: false,
+                },
+                {
+                    label: '配资比例',
+                    prop: "proportion",
+                    disabled: true,
+                },
+                {
+                    label: '是否融资',
+                    prop: "whetherFinancing",
+                    type: 'select',
+                    dicData: [{
+                        label: '是',
+                        value: 1
+                    }, {
+                        label: '否',
+                        value: 0
+                    }],
+                    disabled: false,
+                },
+                {
+                    label: '实际金额',
+                    prop: "goodsTotalShipAmount",
+                    disabled: true,
+                },
+                {
+                    label: '已出实际数量',
+                    prop: "outGoodsTotalShipNum",
+                    disabled: true,
+                },
+                {
+                    label: '已出实际金额',
+                    prop: "outGoodsTotalShipAmount",
                     disabled: true,
                 },
                 {
@@ -677,14 +704,14 @@ export default {
                     disabled: true,
                 },
                 {
-                    label: '可用金额',
-                    prop: "availableAmount",
+                    label: '保证金',
+                    prop: "bondAmount",
                     disabled: true,
                 },
                 {
                     label: '利息',
                     prop: "interest",
-                    disabled: true,
+                    disabled: false,
                 },
                 {
                     label: '备注',
@@ -1031,7 +1058,7 @@ export default {
             }
         }
     },
-    components: { reportDialog, check, checkSchedule },
+    components: { reportDialog, check, checkSchedule, dicSelect },
     props: {
         onLoad: Object,
         detailData: Object
@@ -1126,6 +1153,11 @@ export default {
                 })
             }
         }
+        getParamservice(1, 10, { paramKey: 'first.month.proportion' }).then(res => {
+            if (res.data.data.records.length > 0) {
+                this.form.proportion = res.data.data.records[0].paramValue
+            }
+        })
         this.optionPaymentDetails = await this.getColumnData(this.getColumnName(269.2), this.optionPaymentDetailsBack);
         this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
         this.key++
@@ -1222,6 +1254,15 @@ export default {
         })
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'fundingPartyName') {
+                if (row) {
+                    this.form.fundingPartyId = row.id
+                } else {
+                    this.form.fundingPartyId = null
+                }
+            }
+        },
         //生成退货单
         getReturns() {
             this.$confirm("您确定要退货吗?", {
@@ -1681,7 +1722,7 @@ export default {
                                             background: 'rgba(255,255,255,0.7)'
                                         });
                                         inboundTask({
-                                            bsType: "CG",
+                                            bsType: "RZCG",
                                             ...this.form
                                         }).then(res => {
                                             this.refresh(res.data.data.id)
@@ -1824,7 +1865,7 @@ export default {
                     });
                     this.form.storageName = this.form.$storageId ? this.form.$storageId : ''
                     submit({
-                        bsType: "CG",
+                        bsType: "RZCG",
                         ...this.form
                     }).then(res => {
                         this.$message.success("保存成功");
@@ -1861,7 +1902,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     inboundTask({
-                        bsType: "CG",
+                        bsType: "RZCG",
                         ...this.form
                     }).then(res => {
                         console.log(1);

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -40,6 +40,12 @@
           <el-button v-else :size="size" :type="type"
             :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
+          <el-button v-if="row.confirmWarehouse != 1" :size="size" :type="type"
+            @click="confirm(row, index, 1)">确认入库</el-button>
+          <el-button v-else :size="size" :type="type" @click="confirm(row, index, 2)">撤销入库</el-button>
+          <el-button v-if="row.whetherRedeem != 1" :size="size" :type="type"
+            @click="confirm(row, index, 3)">确认赎回</el-button>
+          <el-button v-else :size="size" :type="type" @click="confirm(row, index, 4)">撤销赎回</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -48,6 +54,7 @@
           <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </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>
         </template>
@@ -67,7 +74,7 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse,confirmRedeem,revokeRedeem } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
@@ -248,7 +255,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 50,
+        menuWidth: 170,
         searchSpan: 6,
         searchMenuSpan: 24,
         searchIcon: true,
@@ -571,7 +578,7 @@ export default {
           }
         }
       }
-      config.params.bsType = 'CG'
+      config.params.bsType = 'RZCG'
       console.log(config, 427)
       const routeData = this.$router.resolve({
         path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
@@ -608,6 +615,32 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
+    confirm(row, index, type) {
+      if (type == 1) {
+        confirmWarehouse(row).then(res => {
+          this.$message.success("确认成功");
+          this.onLoad(this.page, this.search)
+        })
+      }
+      if (type == 2) {
+        revokeWarehouse(row).then(res => {
+          this.$message.success("撤销成功");
+          this.onLoad(this.page, this.search)
+        })
+      }
+      if (type == 3) {
+        confirmRedeem(row).then(res => {
+          this.$message.success("确认成功");
+          this.onLoad(this.page, this.search)
+        })
+      }
+      if (type == 4) {
+        revokeRedeem(row).then(res => {
+          this.$message.success("撤销成功");
+          this.onLoad(this.page, this.search)
+        })
+      }
+    },
     rowDel(form, index) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -636,7 +669,7 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
-        bsType: "CG",
+        bsType: "RZCG",
         ...Object.assign(params, this.search)
       }
       this.loading = true