修改采购计划 首页logo 浏览器标签 财务管理等

src/api/basicData/configuration.js

@@ -260,3 +260,26 @@ export function repealPurchase(data) {
         params: data
     })
   }
+    //生成采购是否显示
+    export function getCorp(data) {
+      return request({
+          url: '/api/blade-purchase-sales/agencyOrder/getCorp',
+          method: 'get',
+          params: data
+      })
+    }
+    export function checkAgencyOrder(data) {
+      return request({
+        url: '/api/blade-purchase-sales/agencyOrder/checkAgencyOrder',
+        method: 'post',
+        data: data
+      })
+    }
+    export function checkAgencyOrderDL(data) {
+      return request({
+        url: '/api/blade-purchase-sales/agencyOrder/checkAgencyOrder',
+        method: 'post',
+        data: data
+      })
+    }
+    

src/api/basicData/proxyOrder.js

@@ -9,6 +9,13 @@ export function customerList(data) {
         params: data
     })
 }
+export function getContractList(data) {
+  return request({
+      url: '/api/blade-purchase-sales//agencyOrder/getContractList',
+      method: 'get',
+      params: data
+  })
+}
 //客户资料列表查看明细
 export function detail(data) {
   return request({

src/enums/column-name.js

@@ -1898,7 +1898,7 @@ const columnName = [{
     name: '达沃特-国内贸易-采购计划'
   },{
     code: 421,
-    name: '达沃特-国内贸易-采购计划'
+    name: '达沃特-国内贸易-采购计划明细'
   }
 ]
 export const getColumnName = (key) => {

src/page/index/logo.vue

@@ -5,10 +5,12 @@
         {{ website.logo }}
       </span>
     </transition>
-    <transition-group name="fade">
+    <div v-if="logoUrl" style="width:140px;height: 40px">
+      <el-image :src="logoUrl" style="width:140px;height: 40px"></el-image>
+    </div>
+    <transition-group v-if="!logoUrl" name="fade">
       <template v-if="!keyCollapse">
-        <span class="avue-logo_title" key="1" @click="goHome"
-          >{{ website.indexTitle }}
+        <span v-if="!logoUrl" class="avue-logo_title" key="1" @click="goHome">{{ website.indexTitle }}
         </span>
       </template>
     </transition-group>
@@ -20,9 +22,15 @@ import { mapGetters } from "vuex";
 export default {
   name: "logo",
   data() {
-    return {};
+    return {
+      logoUrl: null
+    };
+  },
+  created() {
+    if (JSON.parse(localStorage.getItem('user-Information')).logoUrl.includes("png")) {
+      this.logoUrl = JSON.parse(localStorage.getItem('user-Information')).logoUrl
+    }
   },
-  created() {},
   computed: {
     ...mapGetters(["website", "keyCollapse"])
   },
@@ -40,13 +48,16 @@ export default {
 .fade-leave-active {
   transition: opacity 0.2s;
 }
+
 .fade-enter-active {
   transition: opacity 2.5s;
 }
+
 .fade-enter,
 .fade-leave-to {
   opacity: 0;
 }
+
 .avue-logo {
   position: fixed;
   top: 0;
@@ -61,12 +72,14 @@ export default {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
   color: rgba(255, 255, 255, 0.8);
   z-index: 1024;
+
   &_title {
     display: block;
     text-align: center;
     font-weight: 500;
     font-size: 16px;
   }
+
   &_subtitle {
     display: block;
     text-align: center;

src/router/avue-router.js

@@ -32,7 +32,8 @@ RouterPlugin.install = function (vue, option = {}) {
     // 设置标题
     setTitle: (title) => {
       const defaultTitle = this.$vue.$t('title');
-      title = title ? `${title}-${defaultTitle}` : defaultTitle;
+      let titleName=JSON.parse(localStorage.getItem('user-Information')).deptName
+      title = title ? `${title}-${titleName}` : defaultTitle;
       document.title = title;
     },
     closeTag: (value) => {

src/views/approveData/index.vue

@@ -49,6 +49,7 @@
         <span v-else-if="scope.row.checkType == 'YPJ-XSTH'">销售退款退货</span>
         <span v-else-if="scope.row.checkType == 'PJTK'">售后</span>
         <span v-else-if="scope.row.checkType == 'PJCG'">采购</span>
+        <span v-else-if="scope.row.checkType == 'DLDD'">采购计划</span>
       </template>
       <!-- <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/businessManagement/proxyOrder/configuration/mainList.json

@@ -18,8 +18,6 @@
   "menuWidth": 130,
   "dialogClickModal": false,
   "searchLabelWidth": 100,
-  "searchIcon": true,
-  "searchIndex": 2,
   "searchSpan": 8,
   "expand": true,
   "expandWidth": 38,
@@ -57,20 +55,94 @@
     {
       "label": "品牌",
       "prop": "brand",
-      "index": 2,
+      "search": true,
       "overHidden": true
     },
     {
       "label": "客户名称",
       "prop": "corpId",
-      "search": true,
-      "index": 3,
       "overHidden": true
     },
     {
       "label": "业务日期",
       "prop": "businesDate",
-      "index": 3,
+      "search": true,
+      "searchProp": "businesDateList",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "overHidden": true
+    },
+    {
+      "label": "到货地址",
+      "prop": "arrivalAddress",
+      "overHidden": true
+    },
+    {
+      "label": "包装要求",
+      "prop": "packageRemarks",
+      "overHidden": true
+    },
+    {
+      "label": "总条数",
+      "prop": "minOrder",
+      "overHidden": true
+    },
+    {
+      "type": "select",
+      "dicUrl": "/api/blade-user/client/gainUser",
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "label": "制单人",
+      "prop": "createUser",
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "prop": "createTime",
+      "type": "date",
+      "overHidden": true
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "状态",
+      "prop": "status",
+      "search": true,
+      "type": "select",
+      "dicData":[{
+        "label":"录入",
+        "value":0
+      },{
+        "label":"审核提交",
+        "value":1
+      },{
+        "label":"审核通过",
+        "value":3
+      }],
+      "overHidden": true
+    },
+    {
+      "label": "备注",
+      "prop": "textarea",
       "overHidden": true
     }
   ]

src/views/businessManagement/proxyOrder/detailsPageEdit.vue

@@ -15,7 +15,8 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <!-- <el-dropdown-item :disabled="browse || detailData.seeDisabled" @click.native="pleaseCheck">请核数据</el-dropdown-item> -->
+            <el-dropdown-item :disabled="form.status != 0 && !form.id"
+              @click.native="pleaseCheck">请核数据</el-dropdown-item>
             <el-dropdown-item v-if="form.status > 0"
               @click.native="checkScheduleDialog = true, checkId = form.id">审核进度</el-dropdown-item>
             <!-- <el-dropdown-item v-if="form.status == 1" @click.native="repealCancel">撤销请核</el-dropdown-item>
@@ -468,7 +469,9 @@ import {
   getProfit,
   pleaseCheck,
   repealCancel,
-  removeList
+  removeList,
+  getCorp,
+  checkAgencyOrderDL,
 } from "@/api/basicData/configuration"
 import { detail } from "@/api/basicData/proxyOrder"
 import { getList } from "@/api/basicData/commodityType";
@@ -1086,6 +1089,30 @@ export default {
           //   ]
           // }, 
           {
+            label: '客户全称',
+            prop: 'corpId',
+            span: 8,
+            rules: [
+              {
+                required: true,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
+            label: '到货地址',
+            prop: 'arrivalAddress',
+            span: 16,
+            rules: [
+              {
+                required: true,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '品牌',
             prop: 'brand',
             type: "select",
@@ -1128,30 +1155,6 @@ export default {
               }
             ]
           },
-          {
-            label: '客户全称',
-            prop: 'corpId',
-            span: 8,
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'change'
-              }
-            ]
-          },
-          {
-            label: '到货地址',
-            prop: 'arrivalAddress',
-            span: 16,
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },
           // {
           //   label: '生产工厂',
           //   prop: 'productionPlant',
@@ -1334,8 +1337,8 @@ export default {
         policyName: '',
         salesType: 1
       },
-      baseURL: '/api/blade-purchase-sales/orderitems/importPrice', // 商品明细上传路径
-      policyUrl: '/api/blade-purchase-sales/orderitems/importPolicy', // 导入政策上传路径
+      baseURL: '/api/blade-purchase-sales/orderitems/importAgency', // 商品明细上传路径
+      policyUrl: '/api/blade-purchase-sales/orderitems/importAgency ', // 导入政策上传路径
       headers: { "Blade-Auth": 'Bearer ' + getToken() },
       activeName: 'searchList',
       // 商品列表数据合计
@@ -1489,7 +1492,7 @@ export default {
         itemType: event.typeno,
         tradeType: 'GN'
       }).then(res => {
-        row.storageQuantity =  res.data.data.length?res.data.data[0].balanceQuantity:0
+        row.storageQuantity = res.data.data.length ? res.data.data[0].balanceQuantity : 0
       })
       row.integralMultiples = event.integralMultiples
       this.quantityChange(row)
@@ -1764,13 +1767,14 @@ export default {
     },
     // 下载模板
     downloadHandle() {
+      if (!this.form.brand) return this.$message.error('请选择品牌')
       this.$confirm('是否下载模板文件？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         window.open(
-          `/api/blade-purchase-sales/orderitems/exportPrice?${this.website.tokenHeader
+          `/api/blade-purchase-sales/orderitems/exportAgency?brand=${this.form.brand}&${this.website.tokenHeader
           }=${getToken()}`
         );
       }).catch(() => {
@@ -1811,6 +1815,9 @@ export default {
         this.$set(item, 'price', '0')
         this.$set(item, 'amount', '0')
         this.$set(item, 'sort', this.maxFeeNum + 1)
+        if (this.goodsShowData.find(e => e.code == item.code)) {
+          this.$set(item, 'id', this.goodsShowData.find(e => e.code == item.code).id)
+        }
         this.maxFeeNum++
         let a = {
           ...item,
@@ -1819,7 +1826,7 @@ export default {
       })
       this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(goodsData)
       this.removeGoodsRepeat()
-      this.goodsShowData = this.goodsShowData.concat(res.data)
+      this.goodsShowData = res.data
 
     },
     // 政策导入成功钩子
@@ -2056,6 +2063,8 @@ export default {
         this.userList = res.data.data;
       })
       khDetail(data.id).then(res => {
+        console.log(res.data.data)
+        this.$set(this.form, 'brand', res.data.data.goodtypes);
         if (res.data.data.adminProfiles) {
           res.data.data.adminProfiles = res.data.data.adminProfiles.split(",");
           let arr = [];
@@ -2119,7 +2128,7 @@ export default {
         itemType: event[0].typeno,
         tradeType: 'GN'
       }).then(res => {
-        row.storageQuantity =  res.data.data.length?res.data.data[0].balanceQuantity:0
+        row.storageQuantity = res.data.data.length ? res.data.data[0].balanceQuantity : 0
       })
       row.integralMultiples = event[0].integralMultiples
       this.quantityChange(row)
@@ -2149,7 +2158,7 @@ export default {
           itemType: this.tableData[0].typeno,
           tradeType: 'GN'
         }).then(res => {
-          this.goodsShowData[this.choiceIndexT].storageQuantity = res.data.data.length?res.data.data[0].balanceQuantity:0
+          this.goodsShowData[this.choiceIndexT].storageQuantity = res.data.data.length ? res.data.data[0].balanceQuantity : 0
         })
       }
       this.dialogVisible = !this.dialogVisible
@@ -2218,7 +2227,7 @@ export default {
           itemType: this.goodsListSave[item].typeno,
           tradeType: 'GN'
         }).then(res => {
-          this.$set(this.goodsListSave[item], 'storageQuantity',  res.data.data.length?res.data.data[0].balanceQuantity:0)
+          this.$set(this.goodsListSave[item], 'storageQuantity', res.data.data.length ? res.data.data[0].balanceQuantity : 0)
           // this.goodsListSave[item].storageQuantity =  res.data.data
           this.$set(this.goodsListSave[item], 'priceCategory', this.goodsListSave[item].goodsTypeName)
           // this.goodsListSave[item].priceCategory = this.goodsListSave[item].goodsTypeName
@@ -2288,7 +2297,7 @@ export default {
           tradeType: 'GN'
         }).then(res => {
           this.tableData[item].priceCategory = this.tableData[item].goodsTypeName;
-          this.tableData[item].storageQuantity =  res.data.data.length?res.data.data[0].balanceQuantity:0;
+          this.tableData[item].storageQuantity = res.data.data.length ? res.data.data[0].balanceQuantity : 0;
           delete this.tableData[item].goodsTypeName;
           this.tableData[item].itemId = this.tableData[item].id;
           this.$set(this.tableData[item], 'corpName', this.tableData[item].corpName);
@@ -2461,9 +2470,9 @@ export default {
           itemType: list[item].typeno,
           tradeType: 'GN'
         }).then(res => {
-          this.$set(list[item], 'storageQuantity',  res.data.data.length?res.data.data[0].balanceQuantity:0)
+          this.$set(list[item], 'storageQuantity', res.data.data.length ? res.data.data[0].balanceQuantity : 0)
           if (listLength != 0) {
-            this.$set(buyFree[item], 'storageQuantity',  res.data.data.length?res.data.data[0].balanceQuantity:0)
+            this.$set(buyFree[item], 'storageQuantity', res.data.data.length ? res.data.data[0].balanceQuantity : 0)
           }
 
           this.$set(list[item], 'itemType', list[item].typeno)
@@ -2732,12 +2741,12 @@ export default {
         if (valid) {
           const length = this.goodsActives === 'gift' ? this.contactsData.length : this.goodsShowData.length
           const length1 = this.goodsActives === 'goods' ? this.giftData : this.goodsShowData
-          for (let i = 0; i < length; i++) {
-            const data = this.goodsActives === 'gift' ? this.contactsData : this.goodsShowData;
-            if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
-              return this.$message.error('商品信息第' + (Number(i) + 1) + '行订货数量大于库存数量')
-            }
-          }
+          // for (let i = 0; i < length; i++) {
+          //   const data = this.goodsActives === 'gift' ? this.contactsData : this.goodsShowData;
+          //   if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
+          //     return this.$message.error('商品信息第' + (Number(i) + 1) + '行订货数量大于库存数量')
+          //   }
+          // }
           let integral = 0;//积分
           if (length1) {
             length1.forEach(item => {
@@ -3239,22 +3248,21 @@ export default {
     pleaseCheck() {
       const giftList = this.goodsActives == 'gift' ? this.goodsShowData : this.giftData
       if (this.verification()) {
-        this.$confirm(giftList.length == 0 ? "此单没有赠品，确定提交此次审批吗？" : "您确定提交此次申请吗？", {
+        this.$confirm("您确定提交此次申请吗？", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           const data = {
             id: this.form.id,
-            checkType: 'dlqh',
+            checkType: 'DLDD',
             url: '/businessManagement/proxyOrder/index',
             pageStatus: "this.$store.getters.domSaleStatus",
             pageLabel: "采购计划(N)",
-            checkFlag: 2,
           }
           this.pageLoading = true
           this.saveLoading = true
-          pleaseCheck(data).then(res => {
+          checkAgencyOrderDL(data).then(res => {
             this.$message.success('请核成功')
             this.saveActives = ''
             this.queryData(this.form.id)
@@ -3433,7 +3441,7 @@ export default {
           tradeType: 'GN',
           storageId: this.form.storageId
         }).then(res => {
-          item.storageQuantity =  res.data.data.length?res.data.data[0].balanceQuantity:0
+          item.storageQuantity = res.data.data.length ? res.data.data[0].balanceQuantity : 0
         })
       })
       this.$message.success('刷新成功')
@@ -3446,7 +3454,7 @@ export default {
         type: 'warning'
       }).then(() => {
         window.open(
-          `/api/blade-purchase-sales/orderitems/policy?${this.website.tokenHeader
+          `/api/blade-purchase-sales/orderitems/exportAgency?${this.website.tokenHeader
           }=${getToken()}`
         );
       })

src/views/businessManagement/purchaseContract/configuration/mainList.json

@@ -55,20 +55,56 @@
   ],
   "column": [
     {
-      "label": "品牌",
+      "label": "订单号",
       "prop": "brand",
       "index": 2,
       "overHidden": true
     },
     {
-      "label": "客户名称",
+      "label": "合同日期",
       "prop": "corpId",
       "search": true,
       "index": 3,
       "overHidden": true
     },
     {
-      "label": "业务日期",
+      "label": "工厂",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "销售助理",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "业务经理",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "到货地址",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "数量",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "金额",
+      "prop": "requiredArrivalDate",
+      "index": 3,
+      "overHidden": true
+    },
+    {
+      "label": "发货日期",
       "prop": "requiredArrivalDate",
       "index": 3,
       "overHidden": true

src/views/businessManagement/purchaseContract/detailsPageEdit.vue

@@ -261,9 +261,9 @@
                 <el-tab-pane label="赠品" name="gift" :key="'second'" :disabled="goodsDisabled">
                 </el-tab-pane>
               </el-tabs> -->
-              <el-button type="primary" icon="el-icon-plus" size="small" @click="commoditySelection"
+              <!-- <el-button type="primary" icon="el-icon-plus" size="small" @click="commoditySelection"
                 :disabled="detailData.seeDisabled || browse">录入明细
-              </el-button>
+              </el-button> -->
               <!-- <el-button type="primary" icon="el-icon-plus" size="small" @click="policy"
                 :disabled="detailData.seeDisabled || !form.corpId || browse" v-show="goodsActives == 'goods'">政策
               </el-button> -->
@@ -272,7 +272,7 @@
                 :disabled="selection.length < 1 || detailData.seeDisabled || !form.status || form.status < 3 || form.createFreight == 1"
                 @click="getShipmentD" v-show="goodsActives == 'goods'">生成客户收货
               </el-button> -->
-              <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()"
+              <!-- <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()"
                 v-show="goodsActives == 'goods'">报表打印</el-button>
               <el-button type="primary" size="small" icon="el-icon-download" @click="downloadHandle"
                 v-show="goodsActives == 'goods'">下载模板</el-button>
@@ -281,7 +281,7 @@
                 :on-error="uploadError" style="float: right" :before-upload="beforeUpload">
                 <el-button type="primary" size="small" icon="el-icon-upload" v-show="goodsActives == 'goods'"
                   :disabled="detailData.seeDisabled || browse">导 入</el-button>
-              </el-upload>
+              </el-upload> -->
               <!-- <el-button type="warning" icon="el-icon-refresh" size="small" @click="resetStock">库存刷新</el-button>
               <el-button type="danger" icon="el-icon-delete" size="small" @click="removeList"
                 :disabled="(selection.length == 0) || detailData.seeDisabled || browse">删除</el-button> -->

src/views/businessManagement/purchaseContract/index.vue

@@ -102,9 +102,9 @@
             type="text"
             icon="el-icon-delete"
             size="small"
-            @click.stop="rowDel(scope.row,scope.index)"
+            @click.stop="beforeOpenPage(scope.row,scope.index)"
             :disabled="scope.row.status > 0"
-          >删除
+          >查看
           </el-button>
         </template>
       </avue-crud>
@@ -122,7 +122,7 @@
 <script>
 import option from "./configuration/mainList.json";
 import {typeSave, saveSell,detail} from "@/api/basicData/configuration"
-import {customerList,deleteDetails} from "@/api/basicData/proxyOrder"
+import {getContractList,deleteDetails} from "@/api/basicData/proxyOrder"
 import detailPage from "./detailsPageEdit";
 import search from "../../../page/index/search";
 import { defaultDate } from "@/util/date";
@@ -306,7 +306,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList().then(res => {
+      getContractList().then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
@@ -458,7 +458,7 @@ export default {
         corpsTypeId: this.treeDeptId
       })
       this.loading = true;
-      customerList(queryParams).then(res => {
+      getContractList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.dataList.forEach(item => {
           this.$set(item,'insideList',[])
@@ -473,7 +473,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId: parentId}).then(res => {
+      getContractList({parentId: parentId}).then(res => {
         resolve(res.data.data.records);
       });
     },

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -319,10 +319,6 @@
                 :disabled="detailData.seeDisabled || !form.corpId || browse" v-show="goodsActives == 'goods'">
                 政策
               </el-button>
-              <el-button type="primary" icon="el-icon-plus" size="small" @click="DLSelection"
-                :disabled="detailData.seeDisabled || !form.corpId || browse">
-                代理订单
-              </el-button>
               <!--              禁用规则：未选择明细，未点击编辑按钮，未进行审批，已经生成过-->
               <!-- <el-button type="warning" icon="el-icon-plus" size="small"
                 :disabled="selection.length !== goodsShowData.length || detailData.seeDisabled || !form.status || form.status < 3 || form.createFreight == 1 || goodsShowData.length == 0"
@@ -346,6 +342,10 @@
               <el-button type="danger" icon="el-icon-delete" size="small" @click="removeList"
                 :disabled="(selection.length == 0) || detailData.seeDisabled || browse">删除
               </el-button>
+              <el-button  type="primary" icon="el-icon-plus" size="small" @click="DLSelection"
+                :disabled="detailData.seeDisabled || !form.corpId || browse">
+                代理订单
+              </el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -417,7 +417,7 @@
         </el-col>
         <el-col :span="14">
           <basic-container>
-            <avue-crud :option="optionTwo" :table-loading="loading" :data="DLListShow" ref="crud"
+            <avue-crud :option="optionThree" :table-loading="loading" :data="DLListShow" ref="crud"
               @refresh-change="refreshChangeDL" @selection-change="selectionChangeDL" @search-change="DLSearch"
               :page.sync="page">
               <template slot="menuLeft">
@@ -427,7 +427,7 @@
                 </el-tabs>
               </template>
               <template slot="orderQuantity" slot-scope="{row}">
-                <el-input-number v-model="row.orderQuantity" size="small" :controls="false" :precision="0"
+                <el-input-number v-model="row.orderQuantity" size="small" :controls="false"
                   @input="amountChange(row)" style="width: 100%" />
               </template>
               <template slot-scope="scope" slot="menu">
@@ -444,7 +444,7 @@
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" :loading="saveLoading">取 消</el-button>
+        <el-button @click="dialogVisibleDL = false" :loading="saveLoading">取 消</el-button>
         <el-button type="primary" @click="importDL" v-if="commodityData !== true" :loading="saveLoading">导入</el-button>
         <!-- <el-button type="primary" @click="importDL" v-if="commodityData === true" :loading="saveLoading"
           :disabled="tableData.length !== 1">导入</el-button> -->
@@ -666,6 +666,33 @@ export default {
   data() {
     return {
       dataDL: [],
+      optionThree: {
+        header: false,
+        menu:false,
+        column: [
+          {
+            label: '商品名称',
+            prop: 'cname',
+            overHidden: true
+          }, {
+            label: '编码',
+            prop: 'code',
+            overHidden: true
+          }, {
+            label: '规格型号',
+            prop: 'typeno',
+            overHidden: true
+          }, {
+            label: '花纹',
+            prop: 'brandItem',
+            overHidden: true
+          }, {
+            label: '订货数量',
+            prop: 'orderQuantity',
+            overHidden: true
+          }
+        ]
+      },
       optionDL: {
         header: false,
         menu:false,

src/views/iosBasicData/ComputationCenter/index.vue

@@ -100,14 +100,12 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 24,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
                 selection: true,
                 dialogClickModal: false,
-                searchIcon: true,
-                searchIndex: 3,
                 stripe: true,
                 addBtn: false,
                 viewBtn: false,
@@ -146,12 +144,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "提单号",
-                        prop: "mblno",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
                         label: "往来单位",
                         prop: "corpCnName",
                         search: true,
@@ -161,6 +153,7 @@ export default {
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
                         dicData: [],
+                        searchOrder: 1,
                         props: {
                             label: 'cnName',
                             value: 'cnName',
@@ -279,22 +272,55 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "JOB NO",
+                        prop: "businessNo",
+                        width: "120",
+                        search: true,
+                        searchOrder: 3,
+                        overHidden: true
+                    },
+                    {
+                        label: "ACCT NO",
+                        prop: "accountNo",
+                        width: "100",
+                        search: true,
+                        searchOrder: 5,
+                        overHidden: true
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
+                    {
                         label: "对账单号",
                         prop: "checkNo",
                         search: true,
                         width: "100",
+                        searchOrder: 6,
                         overHidden: true
                     },
                     {
                         label: "船名",
                         prop: "vesselCnName",
                         search: true,
+                        searchOrder: 7,
                         overHidden: true
                     },
                     {
                         label: "航次",
                         prop: "voyageNo",
                         search: true,
+                        searchOrder: 8,
                         overHidden: true
                     },
                     {

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

@@ -627,7 +627,7 @@ export default {
                         {
                             label: "所属团队",
                             text: "请选择所属团队",
-                            prop: "teamId",
+                            prop: "teamName",
                             disabled: false,
                             type: 'select',
                             dicData: [],
@@ -898,9 +898,9 @@ export default {
         // 获取所属岗位数据
         postSelectByUserfun() {
             postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res => {
-                this.columnforfun('teamId').dicData = res.data.data
+                this.columnforfun('teamName').dicData = res.data.data
                 // 判断是否有值，没有的话默认第一个
-                if (!this.form.teamId) {
+                if (!this.form.teamName) {
                     this.$set(this.form, 'teamId', res.data.data[0].id)
                     this.$set(this.form, 'teamName', res.data.data[0].postName)
                 }
@@ -1074,7 +1074,7 @@ export default {
                     this.columnforfun('srcCnName').forParameter = { key: 'id', label: 'title', value: 'title' }
                     this.ownDeptLazyTreefun()
                 } else { }
-            } else if (name == 'teamId') {
+            } else if (name == 'teamName') {
                 this.postSelectByUserfun()
             } else {
 
@@ -1219,12 +1219,12 @@ export default {
                 // 分单付费方式
                 this.form[name] = value
             }
-            else if (name == 'teamId') {
+            else if (name == 'teamName') {
                 if (!value) {
                     this.$set(this.form, 'teamId', '')
                     this.$set(this.form, 'teamName', '')
                 }
-                for (let item of this.columnforfun('teamId').dicData) {
+                for (let item of this.columnforfun('teamName').dicData) {
                     if (item.id == value) {
                         this.$set(this.form, 'teamId', item.id)
                         this.$set(this.form, 'teamName', item.postName)
@@ -1430,7 +1430,7 @@ export default {
                     if (!this.form.eta) {
                         msgs.push('ETA')
                     }
-                    if (!this.form.teamId) {
+                    if (!this.form.teamName) {
                         msgs.push('所属团队')
                     }
                     for (let item of this.form.feeCenterListD) {
@@ -1633,7 +1633,7 @@ export default {
                         this.columnforfun('corpCnName').disabled = true
                         this.columnforfun('srcType').disabled = true
                         this.columnforfun('mblno').disabled = true
-                        this.columnforfun('teamId').disabled = true
+                        this.columnforfun('teamName').disabled = true
                         this.columnforfun('refno').disabled = true
                         this.generateBillsfalse = true
                     }
@@ -1658,7 +1658,7 @@ export default {
                         this.columnforfun('corpCnName').disabled = true
                         this.columnforfun('srcType').disabled = true
                         this.columnforfun('mblno').disabled = true
-                        this.columnforfun('teamId').disabled = true
+                        this.columnforfun('teamName').disabled = true
                         this.columnforfun('refno').disabled = true
                     }
                     if (item.curCode == 'CNY') {
@@ -1696,7 +1696,7 @@ export default {
                 this.columnforfun('corpCnName').disabled = true
                 this.columnforfun('srcType').disabled = true
                 this.columnforfun('mblno').disabled = true
-                this.columnforfun('teamId').disabled = true
+                this.columnforfun('teamName').disabled = true
                 this.columnforfun('refno').disabled = true
                 this.generateBillsfalse = true
                 this.pleasereviewType = true // 请核禁用
@@ -1705,7 +1705,7 @@ export default {
                 this.columnforfun('corpCnName').disabled = false
                 this.columnforfun('srcType').disabled = false
                 this.columnforfun('mblno').disabled = false
-                this.columnforfun('teamId').disabled = false
+                this.columnforfun('teamName').disabled = false
                 this.columnforfun('refno').disabled = false
                 this.generateBillsfalse = false
                 this.pleasereviewType = false
@@ -1730,7 +1730,7 @@ export default {
                     this.columnforfun('corpCnName').disabled = true
                     this.columnforfun('srcType').disabled = true
                     this.columnforfun('mblno').disabled = true
-                    this.columnforfun('teamId').disabled = true
+                    this.columnforfun('teamName').disabled = true
                     this.columnforfun('refno').disabled = true
                     this.generateBillsfalse = true
                 }
@@ -1755,7 +1755,7 @@ export default {
                     this.columnforfun('corpCnName').disabled = true
                     this.columnforfun('srcType').disabled = true
                     this.columnforfun('mblno').disabled = true
-                    this.columnforfun('teamId').disabled = true
+                    this.columnforfun('teamName').disabled = true
                     this.columnforfun('refno').disabled = true
                 }
                 if (item.curCode == 'CNY') {

src/views/iosBasicData/PaymentApplication/index.vue

@@ -38,7 +38,8 @@
       </avue-crud>
     </basic-container>
 
-    <finstlbillsDetails ref="finstlbillsDetails" v-if="!isShow" :editSave="editSave" @goBack="goBack"  @toAddEdit="toAddEdit" :key="datekey">
+    <finstlbillsDetails ref="finstlbillsDetails" v-if="!isShow" :editSave="editSave" @goBack="goBack"
+      @toAddEdit="toAddEdit" :key="datekey">
     </finstlbillsDetails>
 
   </div>
@@ -84,8 +85,6 @@ export default {
         menuWidth: 100,
         expand: true,
         rowKey: 'id',
-        searchIndex: 3,
-        searchIcon: true,
         column: [
           {
             label: "单据编号",
@@ -99,6 +98,7 @@ export default {
             prop: "corpCnName",
             search: true,
             width: "120",
+            searchOrder: 1,
             overHidden: true
           },
           {
@@ -295,6 +295,7 @@ export default {
             prop: "businessNo",
             width: "120",
             search: true,
+            searchOrder: 3,
             overHidden: true
           },
           {
@@ -302,18 +303,21 @@ export default {
             prop: "accountNo",
             width: "100",
             search: true,
+            searchOrder: 5,
             overHidden: true
           },
           {
             label: "MB/L NO",
             prop: "mblno",
             search: true,
+            searchOrder: 2,
             overHidden: true
           },
           {
             label: "HB/L NO",
             prop: "hblno",
             search: true,
+            searchOrder: 4,
             overHidden: true
           },
           {
@@ -321,6 +325,21 @@ export default {
             prop: "checkNo",
             search: true,
             width: "100",
+            searchOrder: 6,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            search: true,
+            searchOrder: 7,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            search: true,
+            searchOrder: 8,
             overHidden: true
           },
           {
@@ -340,18 +359,6 @@ export default {
               }
             ],
           },
-          {
-            label: "船名",
-            prop: "vesselCnName",
-            search: true,
-            overHidden: true
-          },
-          {
-            label: "航次",
-            prop: "voyageNo",
-            search: true,
-            overHidden: true
-          },
         ]
       },
       data: [],

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

@@ -628,7 +628,7 @@ export default {
                         {
                             label: "所属团队",
                             text: "请选择所属团队",
-                            prop: "teamId",
+                            prop: "teamName",
                             disabled: false,
                             type: 'select',
                             dicData: [],
@@ -744,7 +744,7 @@ export default {
                     value: 'cyCnName',
                 },
             ],
-            imporiData: [{ id: 0, name: '导入one模板' }, { id: 1, name: '导入PIL订舱模板' }, { id: 2, name: '导入截单格式' }],
+            imporiData: [{ id: 0, name: '导入one模板' }, { id: 1, name: '导入PIL订舱模板' }, { id: 2, name: '导入截单格式' }, { id: 3, name: '导入海信提单' }],
             excelForm: {},
             excelLoading: false,
             excelOption: {
@@ -897,6 +897,8 @@ export default {
                 this.excelOption.column[0].action = '/api/blade-los/templateImport/importPilBooking'
             } else if (row == 2) {
                 this.excelOption.column[0].action = '/api/blade-los/templateImport/importPilCutOffOrders'
+            }else if (row == 3) {
+                this.excelOption.column[0].action = '/api/blade-los/templateImport/importHisenseBill'
             }
             this.excelBox = true
         },
@@ -1044,9 +1046,9 @@ export default {
         // 获取所属岗位数据
         postSelectByUserfun() {
             postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res => {
-                this.columnforfun('teamId').dicData = res.data.data
+                this.columnforfun('teamName').dicData = res.data.data
                 // 判断是否有值，没有的话默认第一个
-                if (!this.form.teamId) {
+                if (!this.form.teamName) {
                     this.$set(this.form, 'teamId', res.data.data[0].id)
                     this.$set(this.form, 'teamName', res.data.data[0].postName)
                 }
@@ -1260,7 +1262,7 @@ export default {
                     this.columnforfun('srcCnName').forParameter = { key: 'id', label: 'title', value: 'title' }
                     this.ownDeptLazyTreefun()
                 } else { }
-            } else if (name == 'teamId') {
+            } else if (name == 'teamName') {
                 this.postSelectByUserfun()
             } else {
 
@@ -1432,12 +1434,12 @@ export default {
                     this.$set(this.form, 'hpayplace', this.form.podEnName.split(' - ')[0])
                 }
             }
-            else if (name == 'teamId') {
+            else if (name == 'teamName') {
                 if (!value) {
                     this.$set(this.form, 'teamId', '')
                     this.$set(this.form, 'teamName', '')
                 }
-                for (let item of this.columnforfun('teamId').dicData) {
+                for (let item of this.columnforfun('teamName').dicData) {
                     if (item.id == value) {
                         this.$set(this.form, 'teamId', item.id)
                         this.$set(this.form, 'teamName', item.postName)
@@ -1639,7 +1641,7 @@ export default {
                     if (!this.form.etd) {
                         msgs.push('ETD')
                     }
-                    if (!this.form.teamId) {
+                    if (!this.form.teamName) {
                         msgs.push('所属团队')
                     }
                     for (let item of this.form.feeCenterListD) {
@@ -1925,7 +1927,7 @@ export default {
             // }else {
             //     this.detailData.seeDisabled = false
             // }
-            this.columnforfun('teamId').disabled = true
+            this.columnforfun('teamName').disabled = true
             this.columnforfun('operatorName').disabled = true
             this.columnforfun('accDeptName').disabled = true
             if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
@@ -1970,7 +1972,7 @@ export default {
                     this.columnforfun('mblno').disabled = true
                     this.columnforfun('bookingNo').disabled = true
                     this.columnforfun('refno').disabled = true
-                    this.columnforfun('teamId').disabled = true
+                    this.columnforfun('teamName').disabled = true
                     this.generateBillsfalse = true
                 }
                 if (item.curCode == 'CNY') {
@@ -1996,7 +1998,7 @@ export default {
                     this.columnforfun('mblno').disabled = true
                     this.columnforfun('bookingNo').disabled = true
                     this.columnforfun('refno').disabled = true
-                    this.columnforfun('teamId').disabled = true
+                    this.columnforfun('teamName').disabled = true
                 }
                 if (item.curCode == 'CNY') {
                     this.$set(item, 'rmbAmount', item.amount)

src/views/iosBasicData/VoucherTemplates/index.vue

@@ -71,7 +71,8 @@
                                           :clearable="true"
                                           :remote="true"
                                           :buttonIf="false"
-                                          :forParameter="{key:'id',label:'code',value:'code'}"
+                                          :desc="true"
+                                          :forParameter="{key:'id',label:'code',value:'code',desc:'fullName'}"
                                           @corpFocus="accountsListfun"
                                           @remoteMethod="accountsListfun"
                                           @corpChange="corpChange($event,'subjectCode')">
@@ -334,7 +335,7 @@
                     for (let item of this.subjectData) {
                         if (item.code == value) {
                             this.$set(this.form,'subjectCode',item.code)
-                            this.$set(this.form,'subjectName',item.cnName)
+                            this.$set(this.form,'subjectName',item.fullName)
                         }
                     }
                 }

src/views/iosBasicData/fininvoices/index.vue

@@ -5,7 +5,7 @@
         :before-open="beforeOpen" v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
         @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
         @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-        @size-change="sizeChange" @refresh-change="refreshChange"  :search.sync="query"
+        @size-change="sizeChange" @refresh-change="refreshChange" :search.sync="query"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 318)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 318)" @on-load="onLoad">
         <template slot="menuLeft">
@@ -41,7 +41,8 @@
         </tempalte>
       </avue-crud>
     </basic-container>
-    <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack" @toAddEdit="toAddEdit" :key="datekey">
+    <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"
+      @toAddEdit="toAddEdit" :key="datekey">
     </fininvoicesDetails>
   </div>
 </template>
@@ -78,7 +79,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 12,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: true,
@@ -102,27 +103,42 @@ export default {
             prop: "invoiceDate",
             overHidden: true,
           },
-          {
-            label: "单据开始日期",
-            prop: "invoiceDateStart",
+          // {
+          //   label: "单据开始日期",
+          //   prop: "invoiceDateStart",
+          //   search: true,
+          //   overHidden: true,
+          //   hide: true,
+          //   searchLabelWidth: "100",
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          // },
+          // {
+          //   label: "单据结束日期",
+          //   prop: "invoiceDateEnd",
+          //   search: true,
+          //   overHidden: true,
+          //   hide: true,
+          //   searchLabelWidth: "100",
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          // },
+          {
+            label: "开票日期",
+            prop: "date",
             search: true,
             overHidden: true,
             hide: true,
-            searchLabelWidth: "100",
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-          },
-          {
-            label: "单据结束日期",
-            prop: "invoiceDateEnd",
-            search: true,
-            overHidden: true,
-            hide: true,
-            searchLabelWidth: "100",
+            // searchLabelWidth: "100",
             type: "date",
+            searchProp: "dateList",
+            unlinkPanels: true,
+            searchRange: true,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
+            searchDefaultTime: ["00:00:00", "23:59:59"],
           },
           {
             label: "发票号码",
@@ -173,6 +189,7 @@ export default {
             prop: "corpCnName",
             search: true,
             width: 120,
+            searchOrder: 1,
             overHidden: true,
           },
           {
@@ -183,6 +200,58 @@ export default {
             overHidden: true,
           },
           {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "对账单号",
+            prop: "checkNo",
+            search: true,
+            width: "100",
+            searchOrder: 6,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            search: true,
+            searchOrder: 7,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            search: true,
+            searchOrder: 8,
+            overHidden: true
+          },
+          {
             label: "客户英文名称",
             prop: "corpEnName",
             width: 120,
@@ -712,6 +781,12 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      if (!this.query.dateList) {
+        this.query.invoiceDateStart = null
+        this.query.invoiceDateEnd = null
+      } else {
+        this.query.invoiceDateStart = this.query.dateList[0]
+      }
       fininvoicesList(page.currentPage, page.pageSize,
         { ...Object.assign(params, this.query), type: "进项", billNoFormat: 'JXFP', businessTypeCode: 'JXFP' }).then(res => {
           const data = res.data.data;

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-table ref="tableRef" :cell-style="cellStyle" :header-cell-style="tableHeaderCellStyle" :data="tableData" border
-            style="width: 100%" @selection-change="handleSelectionChange" @row-click="rowClick" :row-style="rowStyle"
-            :row-class-name="rowClassName">
+        <el-table ref="tableRef" :cell-style="cellStyle" :header-cell-style="tableHeaderCellStyle" :data="tableData"
+            border style="width: 100%" @selection-change="handleSelectionChange" @row-click="rowClick"
+            :row-style="rowStyle" :row-class-name="rowClassName">
             <el-table-column fixed="left" type="selection" width="55">
             </el-table-column>
             <el-table-column prop="lineNo" label="行号" width="50px">
@@ -17,8 +17,8 @@
             <!--</el-table-column>-->
             <el-table-column prop="dc" label="收/付" width="80px" header-align="center">
                 <template slot-scope="{ row }">
-                    <span v-if="row.dc=='D'">收</span>
-                    <span v-if="row.dc=='C'">付</span>
+                    <span v-if="row.dc == 'D'">收</span>
+                    <span v-if="row.dc == 'C'">付</span>
                 </template>
             </el-table-column>
             <el-table-column prop="mblno" label="MB/L NO">
@@ -37,8 +37,9 @@
             <el-table-column prop="currentAmountCNY" label="本次CNY" width="120px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentAmountCNY" v-if="!editSave" type="number"
-                        min="0" size="mini" autocomplete="off" :disabled="scope.row.currentCurCode != 'CNY'" clearable
-                        placeholder="请输入本次发票金额" @change="armbChange(scope.row)">
+                        min="0" size="mini" autocomplete="off"
+                        :disabled="scope.row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4')"
+                        clearable placeholder="请输入本次发票金额" @change="armbChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentAmountCNY }}</span>
                 </template>

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -78,7 +78,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         viewBtn: true,
@@ -102,6 +102,7 @@ export default {
             prop: "corpCnName",
             width: "120",
             search: true,
+            searchOrder: 1,
             overHidden: true,
           },
           {
@@ -150,27 +151,42 @@ export default {
             prop: "invoiceDate",
             overHidden: true,
           },
-          {
-            label: "单据开始日期",
-            prop: "invoiceDateStart",
-            search: true,
-            overHidden: true,
-            hide: true,
-            searchLabelWidth: "100",
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-          },
-          {
-            label: "单据结束日期",
-            prop: "invoiceDateEnd",
+          // {
+          //   label: "单据开始日期",
+          //   prop: "invoiceDateStart",
+          //   search: true,
+          //   overHidden: true,
+          //   hide: true,
+          //   searchLabelWidth: "100",
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          // },
+          // {
+          //   label: "单据结束日期",
+          //   prop: "invoiceDateEnd",
+          //   search: true,
+          //   overHidden: true,
+          //   hide: true,
+          //   searchLabelWidth: "100",
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          // },
+          {
+            label: "开票日期",
+            prop: "date",
             search: true,
             overHidden: true,
             hide: true,
-            searchLabelWidth: "100",
+            // searchLabelWidth: "100",
             type: "date",
+            searchProp: "dateList",
+            unlinkPanels: true,
+            searchRange: true,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
+            searchDefaultTime: ["00:00:00", "23:59:59"],
           },
           {
             label: "原发票号码",
@@ -197,6 +213,58 @@ export default {
             overHidden: true,
           },
           {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "对账单号",
+            prop: "checkNo",
+            search: true,
+            width: "100",
+            searchOrder: 6,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            search: true,
+            searchOrder: 7,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            search: true,
+            searchOrder: 8,
+            overHidden: true
+          },
+          {
             label: "税率 %",
             prop: "taxRate",
             rules: [{
@@ -263,12 +331,12 @@ export default {
             width: "160",
             overHidden: true,
           },
-          {
-            label: "船名/航次",
-            prop: "vesselVoyno",
-            width: "100",
-            overHidden: true,
-          },
+          // {
+          //   label: "船名/航次",
+          //   prop: "vesselVoyno",
+          //   width: "100",
+          //   overHidden: true,
+          // },
           {
             label: "开船日",
             prop: "etd",
@@ -336,16 +404,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "MBL NO",
-            prop: "mblno",
-            overHidden: true,
-          },
-          {
-            label: "HBL NO",
-            prop: "hblno",
-            overHidden: true,
-          },
-          {
             label: "订舱",
             prop: "bookingNo",
             overHidden: true,
@@ -768,6 +826,14 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      if (!this.query.dateList) {
+        this.query.invoiceDateStart = null
+        this.query.invoiceDateEnd = null
+
+      } else {
+        this.query.invoiceDateStart = this.query.dateList[0]
+        this.query.invoiceDateEnd = this.query.dateList[1]
+      }
       fininvoicesList(page.currentPage, page.pageSize,
         { ...Object.assign(params, this.query), type: "申请", billNoFormat: 'FPSQ', businessTypeCode: 'FPSQ' }).then(res => {
           const data = res.data.data;

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -124,7 +124,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 selection: true,
@@ -134,8 +134,6 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
-                searchIcon: true,
-                searchIndex: 3,
                 column: [
                     {
                         label: "单据编号",
@@ -144,43 +142,53 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "提单号",
-                        prop: "mblno",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
                         label: "单据日期",
                         prop: "billDate",
                         overHidden: true,
                     },
-                    {
-                        label: "单据开始日期",
-                        prop: "invoiceDateStart",
+                    // {
+                    //     label: "单据开始日期",
+                    //     prop: "invoiceDateStart",
+                    //     search: true,
+                    //     overHidden: true,
+                    //     hide: true,
+                    //     searchLabelWidth: "100",
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    // },
+                    // {
+                    //     label: "单据结束日期",
+                    //     prop: "invoiceDateEnd",
+                    //     search: true,
+                    //     overHidden: true,
+                    //     hide: true,
+                    //     searchLabelWidth: "100",
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    // },
+                    {
+                        label: "开票日期",
+                        prop: "date",
                         search: true,
                         overHidden: true,
                         hide: true,
-                        searchLabelWidth: "100",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "单据结束日期",
-                        prop: "invoiceDateEnd",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: "100",
+                        // searchLabelWidth: "100",
                         type: "date",
+                        searchProp: "dateList",
+                        unlinkPanels: true,
+                        searchRange: true,
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
                     },
                     {
                         label: "客户名称",
                         prop: "corpCnName",
                         width: "120",
                         search: true,
+                        searchOrder: 1,
                         overHidden: true,
                     },
                     {
@@ -214,6 +222,58 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "JOB NO",
+                        prop: "businessNo",
+                        width: "120",
+                        search: true,
+                        searchOrder: 3,
+                        overHidden: true
+                    },
+                    {
+                        label: "ACCT NO",
+                        prop: "accountNo",
+                        width: "100",
+                        search: true,
+                        searchOrder: 5,
+                        overHidden: true
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
+                    {
+                        label: "对账单号",
+                        prop: "checkNo",
+                        search: true,
+                        width: "100",
+                        searchOrder: 6,
+                        overHidden: true
+                    },
+                    {
+                        label: "船名",
+                        prop: "vesselCnName",
+                        search: true,
+                        searchOrder: 7,
+                        overHidden: true
+                    },
+                    {
+                        label: "航次",
+                        prop: "voyageNo",
+                        search: true,
+                        searchOrder: 8,
+                        overHidden: true
+                    },
+                    {
                         label: "开票金额",
                         prop: "amountLoc",
                         width: "120",
@@ -238,7 +298,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 selection: true,
@@ -261,17 +321,12 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "提单号",
-                        prop: "mblno",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
                         label: "客户名称",
                         prop: "corpCnName",
                         width: "120",
                         search: true,
                         overHidden: true,
+                        searchOrder: 1,
                     },
                     {
                         label: "费用名称",
@@ -319,27 +374,42 @@ export default {
                         prop: "invoiceDate",
                         overHidden: true,
                     },
-                    {
-                        label: "单据开始日期",
-                        prop: "invoiceDateStart",
+                    // {
+                    //     label: "单据开始日期",
+                    //     prop: "invoiceDateStart",
+                    //     search: true,
+                    //     overHidden: true,
+                    //     hide: true,
+                    //     searchLabelWidth: "100",
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    // },
+                    // {
+                    //     label: "单据结束日期",
+                    //     prop: "invoiceDateEnd",
+                    //     search: true,
+                    //     overHidden: true,
+                    //     hide: true,
+                    //     searchLabelWidth: "100",
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    // },
+                    {
+                        label: "开票日期",
+                        prop: "date",
                         search: true,
                         overHidden: true,
                         hide: true,
-                        searchLabelWidth: "100",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "单据结束日期",
-                        prop: "invoiceDateEnd",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: "100",
+                        // searchLabelWidth: "100",
                         type: "date",
+                        searchProp: "dateList",
+                        unlinkPanels: true,
+                        searchRange: true,
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
                     },
                     {
                         label: "原发票号码",
@@ -391,6 +461,58 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "JOB NO",
+                        prop: "businessNo",
+                        width: "120",
+                        search: true,
+                        searchOrder: 3,
+                        overHidden: true
+                    },
+                    {
+                        label: "ACCT NO",
+                        prop: "accountNo",
+                        width: "100",
+                        search: true,
+                        searchOrder: 5,
+                        overHidden: true
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
+                    {
+                        label: "对账单号",
+                        prop: "checkNo",
+                        search: true,
+                        width: "100",
+                        searchOrder: 6,
+                        overHidden: true
+                    },
+                    {
+                        label: "船名",
+                        prop: "vesselCnName",
+                        search: true,
+                        searchOrder: 7,
+                        overHidden: true
+                    },
+                    {
+                        label: "航次",
+                        prop: "voyageNo",
+                        search: true,
+                        searchOrder: 8,
+                        overHidden: true
+                    },
+                    {
                         label: "客户英文名称",
                         prop: "corpEnName",
                         width: "120",
@@ -983,7 +1105,7 @@ export default {
         },
         // 获取列表数据
         onLoad(page, params = {}) {
-            this.loading = true;
+
             let type = null
             let status = null
             let billStatus = null
@@ -998,6 +1120,15 @@ export default {
                 type = '销项'
                 status = 3
             }
+            if (!this.query.dateList) {
+                this.query.invoiceDateStart = null
+                this.query.invoiceDateEnd = null
+
+            } else {
+                this.query.invoiceDateStart = this.query.dateList[0]
+                this.query.invoiceDateEnd = this.query.dateList[1]
+            }
+            this.loading = true;
             fininvoicesList(page.currentPage, page.pageSize, {
                 ...Object.assign(params, this.query),
                 type: type,

src/views/iosBasicData/finstlbills/index.vue

@@ -79,7 +79,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 6,
         border: true,
         index: true,
         viewBtn: true,
@@ -133,6 +133,7 @@ export default {
             prop: "corpCnName",
             search: true,
             width: "120",
+            searchOrder: 1,
             overHidden: true,
           },
           {
@@ -141,6 +142,58 @@ export default {
             width: "120",
             overHidden: true,
           },
+          {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "对账单号",
+            prop: "checkNo",
+            search: true,
+            width: "100",
+            searchOrder: 6,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            search: true,
+            searchOrder: 7,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            search: true,
+            searchOrder: 8,
+            overHidden: true
+          },
           // {
           //   label: "客户是否已签约",
           //   prop: "corpIsSigned",
@@ -301,16 +354,6 @@ export default {
           //   prop: "voyageNo",
           //   overHidden: true,
           // },
-          {
-            label: "MB/L NO",
-            prop: "mblno",
-            overHidden: true,
-          },
-          {
-            label: "HB/L NO",
-            prop: "hblno",
-            overHidden: true,
-          },
           // {
           //   label: "财务开始日期",
           //   prop: "accountDateFrom",

src/views/wel/index.vue

@@ -69,6 +69,7 @@ import { setStore } from "@/util/store";
 import { areaTypeTree } from "@/api/basicData/customerInformation";
 import xindongPower from "@/views/wel/home/xindongPower/xindongPower.vue";
 import losHome from "@/views/wel/components/losHome.vue";
+import { getLazyList } from "@/api/system/dept";
 export default {
     name: "wel",
     data() {
@@ -90,6 +91,9 @@ export default {
             this.billType = res.data.data.billType;
             localStorage.setItem('sysitemType', this.billType)
         });
+        getLazyList().then(res=>{
+            localStorage.setItem('user-Information', res.data.data.length?JSON.stringify(res.data.data[0]):null)
+        })
         if (!localStorage.getItem('areaTypeTree')) {
             areaTypeTree().then(res => {
                 localStorage.setItem('areaTypeTree', JSON.stringify(res.data.data));