ソースを参照

核算项目10.10

caojunjie 1 年間 前
コミット
7a430001ae

+ 50 - 0
src/api/iosBasicData/baccitemstype.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const baccitemstypeList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const baccitemstypeDetail = (id) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const baccitemstypeRemove = (ids) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const baccitemstypeSubmit = (row) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 4 - 0
src/enums/column-name.js

@@ -1325,6 +1325,10 @@ const columnName = [{
     code: 299,
     name: '货运代理-基础资料-核算要素'
   },
+  {
+    code: 300,
+    name: '货运代理-基础资料-核算项目'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 362 - 0
src/views/iosBasicData/baccitemstype/baccitems.vue

@@ -0,0 +1,362 @@
+<!--核算项目详情-->
+<template>
+    <div class="borderless" v-loading="pageLoading">
+        <div class="customer-head">
+            <div class="customer-back">
+                <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                           @click="backToList">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"
+                            :loading="saveLoading" @click="editHandle">编 辑
+                </el-button>
+                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
+                            :loading="saveLoading" @click="editCustomer">保 存
+                </el-button>
+            </div>
+        </div>
+        <div class="customer-main">
+            <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
+                <containerTitle title="基础资料"></containerTitle>
+                <basic-container :showBtn="true">
+                    <el-row>
+                        <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8"
+                                :class="{ isShow: item.display }" >
+                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                                <el-select v-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
+                                           filterable style="width: 100%" size="small"
+                                           :disabled="item.disabled || detailData.seeDisabled">
+                                    <el-option v-for="(ite, inde) in item.dicData" :key="inde" :label="ite.label"
+                                               :value="ite.value"></el-option>
+                                </el-select>
+                                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small"
+                                          autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" :placeholder="'请输入' + item.label"></el-input>
+                                <el-input v-else type="age" style="width: 100%;" v-model.trim="form[item.prop]" size="small" autocomplete="off"
+                                          :disabled="item.disabled || detailData.seeDisabled" clearable :placeholder="'请输入' + item.label"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </basic-container>
+            </el-form>
+        </div>
+
+        <div class="customer-main margintop">
+            <containerTitle title="科目列表信息"></containerTitle>
+            <basic-container>
+                <div style="margin-bottom: 10px">
+                    <el-button type="primary"
+                               size="small"
+                               :disabled="detailData.seeDisabled"
+                               @click="accItemspingCompanyAdd">新增数据
+                    </el-button>
+                </div>
+                <el-table
+                    stripe
+                    :data="form.accItemsList"
+                    id="out-table"
+                    :header-cell-class-name="headerClassName"
+                    style="width: 100%">
+                    <el-table-column
+                        prop="code"
+                        label="代码">
+                    </el-table-column>
+                    <el-table-column
+                        prop="cnName"
+                        label="中文名称">
+                    </el-table-column>
+                    <el-table-column
+                        prop="enName"
+                        label="英文名称">
+                    </el-table-column>
+                    <el-table-column
+                        prop="remarks"
+                        label="备注">
+                    </el-table-column>
+                    <el-table-column label="操作">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                :disabled="detailData.seeDisabled"
+                                @click="accItemsCompanyEdit(scope.$index, scope.row)">编辑</el-button>
+                            <el-button
+                                size="small"
+                                type="text"
+                                :disabled="detailData.seeDisabled"
+                                @click="accItemsCompanyDelete(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </basic-container>
+        </div>
+
+
+        <!--科目列表添加弹窗-->
+        <el-dialog
+            title="科目列表"
+            :visible.sync="accItemsVisible"
+            width="50%"
+            append-to-body
+            :destroy-on-close="true"
+            :modal-append-to-body="false"
+            :before-close="accItemsClose">
+            <div>
+                <el-form :model="accItemsForm" ref="accItemsForm" label-width="120px" class="demo-ruleForm">
+                    <el-row>
+                        <el-col v-for="(item, index) in accItemsData.column" :key="index" :span="item.span ? item.span : 12"
+                                :class="{ isShow: item.display }" >
+                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                                <el-input type="textarea" v-if="item.type === 'textarea'" v-model.trim="accItemsForm[item.prop]" size="small"
+                                          autocomplete="off" :disabled="item.disabled" :placeholder="'请输入' + item.label"></el-input>
+                                <el-input v-else type="age" style="width: 100%;" v-model.trim="accItemsForm[item.prop]" size="small" autocomplete="off"
+                                          :disabled="item.disabled" clearable :placeholder="'请输入' + item.label"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                    <el-button @click="accItemsVisible = false;">取 消</el-button>
+                    <el-button type="primary" @click="accItemscompanyConfirm">确 定</el-button>
+                </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {baccitemstypeDetail, baccitemstypeSubmit} from "@/api/iosBasicData/baccitemstype";
+
+export default {
+    props:{
+        detailData: {
+            type: Object
+        }
+    },
+    data(){
+        return {
+            pageLoading:false,
+            saveLoading:false,
+            // 科目列表弹窗
+            accItemsVisible:false,
+            // 科目列表弹窗绑定的数据
+            accItemsForm:{},
+            accItemsIndex:null,
+
+            // 获取到的数据
+            form:{
+                accItemsList:[]
+            },
+            // 基础资料数据
+            basicData:{
+                column:[
+                    {
+                        label: "代码",
+                        prop: "code",
+                        rules: [{
+                            required: true,
+                            message: "请输入代码",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "中文名称",
+                        prop: "cnName",
+                        rules: [{
+                            required: true,
+                            message: "请输入中文名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "英文名称",
+                        prop: "enName",
+                        rules: [{
+                            required: true,
+                            message: "请输入英文名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "状态",
+                        prop: "status",
+                        type:'select',
+                        dicData:[{
+                            label:'启用',
+                            value:0
+                        },{
+                            label:'停用',
+                            value:1
+                        }],
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        span:24,
+                        type: 'textarea',
+                        minRows: 3,
+                    },
+
+                ]
+            },
+            // 科目列表数据
+            accItemsData:{
+                column:[
+                    {
+                        label: "代码",
+                        prop: "code",
+                        rules: [{
+                            required: true,
+                            message: "请输入传公司名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "中文名称",
+                        prop: "cnName",
+                        rules: [{
+                            required: true,
+                            message: "请输入中文名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "英文名称",
+                        prop: "enName",
+                        rules: [{
+                            required: true,
+                            message: "请输入英文名称",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        span:24,
+                        type: 'textarea',
+                        minRows: 3,
+                    },
+                ]
+            },
+        }
+    },
+    methods:{
+        // 获取详情数据
+        baccitemstypeDetailfun(id){
+            this.pageLoading = true
+            baccitemstypeDetail(id).then(res => {
+                this.form = res.data.data;
+                this.pageLoading = false
+            });
+        },
+        // 编辑按钮更改状态
+        editHandle(){
+            this.detailData.seeDisabled = false;
+        },
+        // 保存按钮
+        editCustomer(){
+            this.$refs.form.validate((valid)=>{
+                if (valid) {
+                    this.saveLoading = true
+                    this.baccitemstypeSubmitfun()
+                }else {
+                    return false;
+                }
+            })
+        },
+        // 保存接口
+        baccitemstypeSubmitfun(){
+            this.form.extendedData = JSON.stringify(this.form.extendedDataArr)
+            baccitemstypeSubmit(this.form).then((res)=>{
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                });
+                this.saveLoading = false
+                this.baccitemstypeDetailfun(res.data.data.id)
+                this.detailData.seeDisabled = true;
+            })
+        },
+
+        // 科目列表添加
+        accItemspingCompanyAdd(){
+            this.accItemsVisible = true
+        },
+        // 科目列表编辑
+        accItemsCompanyEdit(index,row){
+            this.accItemsForm = JSON.parse(JSON.stringify(row))
+            this.accItemsIndex = index
+            this.accItemsVisible = true
+        },
+        // 科目列表删除
+        accItemsCompanyDelete(index,row){
+            this.form.accItemsList.splice(index,1)
+        },
+        // 科目列表确认
+        accItemscompanyConfirm(){
+            if (this.accItemsIndex != null) {
+                this.form.accItemsList.splice(this.accItemsIndex,1,this.accItemsForm)
+            }else {
+                this.form.accItemsList.push(this.accItemsForm)
+            }
+            this.accItemsForm = {}
+            this.accItemsIndex = null
+            this.accItemsVisible = false
+        },
+        // 科目列表关闭
+        accItemsClose(done){
+            this.$confirm('确认关闭?')
+                .then(_ => {
+                    done();
+                })
+                .catch(_ => {});
+        },
+        //返回列表
+        backToList() {
+            this.$emit('goBack')
+        },
+        // 更改表格颜色
+        headerClassName(tab){
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+    }
+}
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+.borderless {
+    height: 100%;
+    box-sizing: border-box
+
+}
+.customer-main {
+//margin-top: 20px;
+//width: calc(100% - 140px);
+    margin-bottom: 15px;
+}
+.margintop {
+    margin-top: 10px;
+}
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
+.isShow {
+    display: none;
+}
+</style>

+ 403 - 0
src/views/iosBasicData/baccitemstype/index.vue

@@ -0,0 +1,403 @@
+<template>
+  <div>
+      <basic-container v-if="isShow">
+          <avue-crud :option="option"
+                     :table-loading="loading"
+                     :data="data"
+                     :page.sync="page"
+                     :permission="permissionList"
+                     id="out-table"
+                     :header-cell-class-name="headerClassName"
+                     :before-open="beforeOpen"
+                     v-model="form"
+                     ref="crud"
+                     @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"
+                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 300)"
+                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 300)"
+                     @on-load="onLoad">
+              <template slot="menuLeft">
+                  <el-button type="primary"
+                             size="small"
+                             icon="el-icon-plus"
+                             @click="addbtnfun()">新增
+                  </el-button>
+                  <el-button type="danger"
+                             size="small"
+                             icon="el-icon-delete"
+                             plain
+                             @click="handleDelete">删 除
+                  </el-button>
+              </template>
+          </avue-crud>
+      </basic-container>
+
+      <bacc-items ref="baccitems" v-if="!isShow" :detailData="detailData" @goBack="goBack"></bacc-items>
+  </div>
+</template>
+
+<script>
+  import {baccitemstypeList, baccitemstypeDetail, baccitemstypeSubmit, baccitemstypeRemove} from "@/api/iosBasicData/baccitemstype";
+  import {mapGetters} from "vuex";
+  import baccItems from "@/views/iosBasicData/baccitemstype/baccitems.vue";
+
+  export default {
+      components: {baccItems},
+    data() {
+      return {
+          // 详情传递的数据
+          detailData:{},
+          isShow:true, // 详情和列表切换
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option:{},
+        optionBack: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "代码",
+              prop: "code",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入代码",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "中文名称",
+              prop: "cnName",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入中文名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "英文名称",
+              prop: "enName",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入英文名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "版本",
+              prop: "version",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "状态",
+              prop: "status",
+                type:'select',
+                dicData:[{
+                    label:'启用',
+                    value:0
+                },{
+                    label:'停用',
+                    value:1
+                }],
+              rules: [{
+                required: true,
+                message: "请选择状态",
+                trigger: "blur"
+              }]
+            },
+              {
+                  label: "主键",
+                  prop: "id",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建人 Id",
+                  prop: "createUser",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建人",
+                  prop: "createUserName",
+                  display:false,
+              },
+              {
+                  label: "创建部门 Id",
+                  prop: "createDept",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建部门",
+                  prop: "createDeptName",
+                  display:false,
+              },
+              {
+                  label: "创建时间",
+                  prop: "createTime",
+                  display:false,
+              },
+              {
+                  label: "修改人 Id",
+                  prop: "updateUser",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "修改人",
+                  prop: "updateUserName",
+                  display:false,
+              },
+              {
+                  label: "修改时间",
+                  prop: "updateTime",
+                  display:false,
+              },
+            {
+              label: "是否已删除(0 否 1是)",
+              prop: "isDeleted",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "备注",
+              prop: "remarks",
+                span:24,
+                type: 'textarea',
+                width: "180",
+                slot: true,
+                minRows: 3,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.baccitemstype_add, false),
+          viewBtn: this.vaildData(this.permission.baccitemstype_view, false),
+          delBtn: this.vaildData(this.permission.baccitemstype_delete, false),
+          editBtn: this.vaildData(this.permission.baccitemstype_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+      async created() {
+          this.option = await this.getColumnData(this.getColumnName(300), this.optionBack);
+      },
+    methods: {
+        // 详情的返回列表
+        goBack(){
+            // 初始化数据
+            // this.detailData = this.$options.data().detailData;
+            if (JSON.stringify(this.$route.query) != "{}") {
+                this.$router.$avueRouter.closeTag();
+                this.$router.push({
+                    path: "/iosBasicData/baccitemstype/index"
+                });
+            }
+            this.isShow = true;
+            this.onLoad(this.page, this.search);
+        },
+        // 添加弹窗开启
+        addbtnfun(){
+            this.detailData = {
+                seeDisabled: false,
+            };
+            this.isShow = false
+        },
+
+      rowSave(row, done, loading) {
+        baccitemstypeSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        baccitemstypeSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return baccitemstypeRemove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return baccitemstypeRemove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          baccitemstypeDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        baccitemstypeList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab){
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+
+    }
+  };
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

+ 0 - 5
src/views/iosBasicData/bports/index.vue

@@ -361,11 +361,6 @@
                 seeDisabled: false,
             };
             this.isShow = false
-            this.$nextTick(()=>{
-                // console.log(this.$refs.portsterms)
-                // console.log(this.$refs.portsterms.bportsDetailfun())
-            })
-            // rowAdd
         },
         // 编辑详情打开
         rowCellfun(row,index){

+ 3 - 2
src/views/iosBasicData/bports/portsTerms.vue

@@ -396,6 +396,7 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                         //     })
                         // }else {
                         // }
+                        this.saveLoading = true
                         this.bportsSubmitfun()
                     }else {
                         return false;
@@ -406,12 +407,12 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
             bportsSubmitfun(){
                 this.form.extendedData = JSON.stringify(this.form.extendedDataArr)
                 bportsSubmit(this.form).then((res)=>{
-                    console.log(res,408)
                     this.$message({
                         type: "success",
                         message: "操作成功!"
                     });
-                    // this.bportsDetailfun(res.data.id)
+                    this.saveLoading = false
+                    this.bportsDetailfun(res.data.data.id)
                     this.detailData.seeDisabled = true;
                 })
             },