Jelajahi Sumber

期间管理新加字段

Qukatie 6 bulan lalu
induk
melakukan
464210bb31

+ 1 - 1
src/store/modules/user.js

@@ -234,7 +234,7 @@ const user = {
       return new Promise(resolve => {
         const obj = {
           topMenuId: topMenuId,
-          type:getStore({ name: 'language' })=='en'?1:0
+          type:getStore({ name: 'language' })
         }
         getRoutes(obj).then((res) => {
           const data = res.data.data

+ 6 - 0
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -3317,6 +3317,9 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用,不允许撤销");
                     }
+                    if (row.auditStatus > 2) {
+                        return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+                    }
                 }
                 this.$confirm("确定撤销请核?", {
                     confirmButtonText: "确定",
@@ -3413,6 +3416,9 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用,不允许撤销");
                     }
+                       if (row.auditStatus > 2) {
+                        return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+                    }
                 }
                 this.$confirm("确定撤销请核?", {
                     confirmButtonText: "确定",

+ 12 - 20
src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -456,7 +456,7 @@ export default {
                 //     // 禁用主单
                 //     return row.billType != 'MM'
                 // },
-                               rowKey: "id",
+                rowKey: "id",
                 height: 500,
                 calcHeight: 30,
                 tip: false,
@@ -479,7 +479,7 @@ export default {
                 align: "center",
                 showSummary: true,
                 column: [
-                     {
+                    {
                         label: "所属公司",
                         prop: "branchId",
                         width: "120",
@@ -535,7 +535,7 @@ export default {
                         width: "160",
                         overHidden: true
                     },
-                               {
+                    {
                         label: '箱属',
                         prop: 'boxBelongsTo',
                         width: 100,
@@ -652,6 +652,12 @@ export default {
                         searchOrder: 7
                     },
                     {
+                        label: "客服",
+                        prop: "customerServiceName",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
                         label: "开船日期",
                         prop: "etd",
                         searchProp: "etdList",
@@ -973,7 +979,7 @@ export default {
                         width: "100",
                         overHidden: true
                     },
-                                        {
+                    {
                         label: "20GP",
                         prop: "quantityV20",
                         width: "100",
@@ -1155,20 +1161,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "客户来源",
-                        prop: "corpSource",
-                        width: 140,
-                        overHidden: true,
-                        search: true,
-                        type: "select",
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=corp_Source",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        }
-                    },
-                    {
                         label: "客户OP",
                         prop: "operatorName",
                         width: 140,
@@ -1453,7 +1445,7 @@ export default {
             this.mawbOptionBack
         ); // 主单列表
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 12
+            this.option.searchMenuSpan = 24
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -2519,7 +2511,7 @@ export default {
                 this[optionBack]
             );
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 12
+                this.option.searchMenuSpan = 24
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true

+ 40 - 40
src/views/iosBasicData/PaymentApplication/index.vue

@@ -152,37 +152,37 @@ export default {
             width: "120",
             overHidden: true
           },
-          {
-            label: "银行账号",
-            prop: "bankAccountNo",
-            width: "120",
-            overHidden: true
-          },
-          {
-            label: "账户名称",
-            prop: "bankAccountName",
-            width: "120",
-            overHidden: true
-          },
-          {
-            label: "账户银行",
-            prop: "bankAccountBank",
-            width: "120",
-            overHidden: true
-          },
-          {
-            label: "付费事由",
-            prop: "remarks",
-            overHidden: true,
-            search: true,
-          },
-          {
-            label: "收款情况",
-            prop: "collectionSituation",
-            search: true,
-            width: "120",
-            overHidden: true
-          },
+          // {
+          //   label: "银行账号",
+          //   prop: "bankAccountNo",
+          //   width: "120",
+          //   overHidden: true
+          // },
+          // {
+          //   label: "账户名称",
+          //   prop: "bankAccountName",
+          //   width: "120",
+          //   overHidden: true
+          // },
+          // {
+          //   label: "账户银行",
+          //   prop: "bankAccountBank",
+          //   width: "120",
+          //   overHidden: true
+          // },
+          // {
+          //   label: "付费事由",
+          //   prop: "remarks",
+          //   overHidden: true,
+          //   search: true,
+          // },
+          // {
+          //   label: "收款情况",
+          //   prop: "collectionSituation",
+          //   search: true,
+          //   width: "120",
+          //   overHidden: true
+          // },
           {
             label: "审核状态",
             prop: "status",
@@ -213,15 +213,15 @@ export default {
             search: true,
             overHidden: true,
           },
-          {
-            label: "预计收回",
-            prop: "estimatedTime",
-            type: 'date',
-            format: "yyyy-MM-dd",
-            valueFormat: 'yyyy-MM-dd',
-            width: "120",
-            overHidden: true
-          },
+          // {
+          //   label: "预计收回",
+          //   prop: "estimatedTime",
+          //   type: 'date',
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: 'yyyy-MM-dd',
+          //   width: "120",
+          //   overHidden: true
+          // },
           {
             label: "预计开始收回",
             prop: "estimatedTimeStart",

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -3175,7 +3175,7 @@ export default {
                         return this.$message.error("未申请费用,不允许撤销");
                     }
                     if (row.auditStatus > 2) {
-                        return this.$message.error("请核通过的费用,不允许撤销");
+                        return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }
                 this.$confirm("确定撤销请核?", {
@@ -3391,7 +3391,7 @@ export default {
                         return this.$message.error("未申请费用,不允许撤销");
                     }
                     if (row.auditStatus > 2) {
-                        return this.$message.error("请核通过的费用,不允许撤销");
+                        return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }
                 this.$confirm("确定撤销请核?", {

+ 3 - 17
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -761,9 +761,9 @@ export default {
                         searchOrder: 6
                     },
                     {
-                        label: "booking NO",
-                        prop: "bookingNo",
-                        width: "120",
+                        label: "客服",
+                        prop: "customerServiceName",
+                        width: "80",
                         overHidden: true,
                     },
                     {
@@ -1177,20 +1177,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "客户来源",
-                        prop: "corpSource",
-                        width: 140,
-                        overHidden: true,
-                        search: true,
-                        type: "select",
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=corp_Source",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        }
-                    },
-                    {
                         label: "创建人",
                         prop: "createUserName",
                         search: true,

+ 63 - 12
src/views/iosBasicData/periodManagement/index.vue

@@ -5,7 +5,8 @@
                 <el-tab-pane label="会计期间" name="first">
                     <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading"
                         :data="dataList" ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange"
-                        @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 366)"
+                        @refresh-change="refreshChange"
+                        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 366)"
                         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 366)" :page.sync="page">
                         <template slot-scope="{type,size,row,index}" slot="menu">
                             <el-button size="small" :type="type" :disabled="row.lockingStatus != 0"
@@ -18,7 +19,8 @@
                                 @click="inClose(row, 2)">反结转</el-button>
                         </template>
                         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-                            <el-button type="success" size="small" @click="openDialog = true; title = '开账'" v-if="showBut">开
+                            <el-button type="success" size="small" @click="openDialog = true; title = '开账'"
+                                v-if="showBut">开
                                 账</el-button>
                             <el-button type="success" size="small" @click="openDialog = true; title = '账套初始化'"
                                 v-if="!showBut">账套初始化</el-button>
@@ -57,9 +59,17 @@
                 开账日期:<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
                     value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
             </span>
-            <span v-else-if="title == '账套初始化'" style="display: flex;align-items: center;">
-                开账日期:<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
-                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
+            <span v-else-if="title == '账套初始化'">
+                <span style="display: flex;align-items: center;">
+                    所属公司:
+                    <dic-select v-model="branchName" placeholder="所属公司" key="id" label="deptName"
+                        url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName"
+                        @selectChange="dicChange('branchName', $event)" style="width:220px"></dic-select>
+                </span>
+                <span style="display: flex;align-items: center;">
+                    开账日期:<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
+                </span>
             </span>
             <el-dialog v-dialogdrag append-to-body title="凭证明细" :visible.sync="itemOpenDialog" width="50%"
                 :before-close="handleClose2">
@@ -101,16 +111,18 @@
         </el-dialog>
     </div>
 </template>
-  
+
 <script>
 import { getList, currentPeriod, open, init, locking, revokeLocking, close, unclose, generateVouchers, submitPeriod, getPeriodExchangeRate } from "@/api/iosBasicData/periodManagement";
 import detailsPage from "./detailsPage"
 import { defaultDate4 } from "@/util/date";
 import { getToken } from "@/util/auth";
+import dicSelect from "@/components/dicSelect/main";
 export default {
     name: "index",
     components: {
-        detailsPage
+        detailsPage,
+        dicSelect
     },
     data() {
         return {
@@ -297,6 +309,8 @@ export default {
             showBut: false,
             title: '开账',
             openDate: null,
+            branchName: null,
+            branchId: null,
             openDialog: false,
             itemOpenDialog: false,
             activeName: 'first',
@@ -335,6 +349,22 @@ export default {
                 dialogWidth: "70%",
                 column: [
                     {
+                        label: '所属公司',
+                        prop: "branchId",
+                        width: "120",
+                        overHidden: true,
+                        hide: true,
+                        //showColumn: false,
+                        type: "select",
+                        filterable: true,
+                        dicUrl: "/api/blade-system/dept/lazy-list",
+                        props: {
+                            label: "deptName",
+                            value: "id",
+                        },
+                        search: true,
+                    },
+                    {
                         label: '会计年度',
                         prop: "periodYear",
                         search: true,
@@ -344,6 +374,12 @@ export default {
                         valueFormat: "yyyy"
                     },
                     {
+                        label: '所属公司',
+                        prop: "branchName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: '期间',
                         prop: "periodDate",
                         overHidden: true,
@@ -373,7 +409,7 @@ export default {
                         overHidden: true,
                         search: true,
                         dicData: [
-                        {
+                            {
                                 label: '未结转',
                                 value: 0,
                             }, {
@@ -450,6 +486,16 @@ export default {
         this.option2 = await this.getColumnData(this.getColumnName(367), this.optionList2);
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'branchName') {
+                if (row) {
+                    this.branchId = row.id
+                } else {
+                    this.branchId = null
+                    this.branchName = null
+                }
+            }
+        },
         exportExcel(type) {
             const routeData = this.$router.resolve({
                 path: '/api/blade-los/finperiod/export',      //跳转目标窗口的地址
@@ -565,6 +611,8 @@ export default {
         handleClose() {
             this.itemForm = {}
             this.openDate = null
+            this.branchId = null
+            this.branchName = null
             this.openDialog = false
         },
         handleClose2() {
@@ -588,7 +636,7 @@ export default {
                 type: 'warning'
             }).then(() => {
                 this.loading = true
-                init({ beginDate: this.openDate }).then(res => {
+                init({ beginDate: this.openDate, branchId: this.branchId, branchName: this.branchName }).then(res => {
                     this.loading = false
                     this.$message.success("初始化成功");
                     this.handleClick(this.activeName)
@@ -683,6 +731,10 @@ export default {
                 this.page.total = res.data.data.total;
                 this.showBut = res.data.data.records.length == 0 ? true : false;
                 this.loading = false
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
             }).finally(() => {
                 this.loading = false
             })
@@ -734,7 +786,7 @@ export default {
     }
 }
 </script>
-  
+
 <style scoped>
 .bottomBox {
     padding: 3px 6px;
@@ -742,5 +794,4 @@ export default {
     color: #fff;
     font-size: 10px;
 }
-</style>
-  
+</style>