Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/lock/lock.js

@@ -44,3 +44,38 @@ export function lockRemove(data) {
     params: data
   })
 }
+// 锁定列表查询
+export const lockConfigList = (current, size, params) => {
+  return request({
+    url: '/api/blade-client/lockconfig/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export function lockConfigSave(data) {
+  return request({
+    url: '/api/blade-client/lockconfig/save',
+    method: 'post',
+    data: data
+  })
+}
+export function lockConfigUpdate(data) {
+  return request({
+    url: '/api/blade-client/lockconfig/update',
+    method: 'post',
+    data: data
+  })
+}
+export function lockConfigDetail(id) {
+  return request({
+    url: '/api/blade-client/lockconfig/detail',
+    method: 'get',
+    params: {
+      id:id
+    }
+  })
+}

src/components/fee-info/main.vue

@@ -66,6 +66,7 @@
         <template slot="corpId" slot-scope="{ row, index }">
           <span v-if="row.$cellEdit" class="required_fields">*</span>
           <crop-select
+            ref="corp"
             style="width: 90% !important;display: inline-block"
             v-if="row.$cellEdit"
             v-model="row.corpId"
@@ -230,6 +231,8 @@ import _ from "lodash";
 import ApplyPayment from "../finance/applyPayment";
 import {applyLoan,paymentApply} from "@/api/financialManagement/paymentRequest";
 import { contrastList } from "@/util/contrastData";
+import { allCropList } from "@/api/basicData/customerInformation";
+import { getCustomerCode, getCustomerName } from "@/enums/management-type";
 
 export default {
   name: "feeInfo",
@@ -297,6 +300,7 @@ export default {
       activeName:"first",
       tab1:true,
       tab2:false,
+      corpList: [],
     };
   },
   props: {
@@ -345,6 +349,11 @@ export default {
     this.getWorkDicts("unit").then(res =>{
       this.unitList = res.data.data
     })
+    allCropList({
+      corpType: getCustomerCode("KG")
+    }).then(res => {
+      this.corpList = res.data.data;
+    });
   },
   components: {
     cropDialog,
@@ -516,9 +525,11 @@ export default {
     //新增
     rowAdd() {
       if (!this.corpId) return this.$message.error('请选择往来单位')
+      let corpName = this.corpList.find(item => this.corpId == item.id).cname
       const params = {
         feesType:this.selectTab,
-        corpId: this.corpId
+        corpId: this.corpId,
+        corpName: corpName
       }
       this.$refs.feeCrud.rowCellAdd(params);
     },

src/components/report-dialog/main.vue

@@ -120,7 +120,6 @@ export default {
       });
     },
     goReport(name) {
-      console.log(name)
       let tenantId = this.$store.getters.userInfo.tenant_id
       if(this.reportName == "同海-统计列表"){
         this.$router.push({
@@ -141,9 +140,17 @@ export default {
         });
       }else if(name == "国内贸易-库存账.ureport.xml"){
         this.$router.push({
-          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
           &code=${this.searchValue.code}
-          &cname=${this.searchValue.cname}`
+          &cname=${this.searchValue.cname}
+          &brandItem=${this.searchValue.brandItem}
+          &placeProduction=${this.searchValue.placeProduction}
+          &typeno=${this.searchValue.typeno}
+          &typenoOne=${this.searchValue.typenoOne}
+          &typenoTwo=${this.searchValue.typenoTwo}
+          &stockName=${this.searchValue.stockName}
+          &brand=${this.searchValue.brand}
+          &tenantId=${tenantId}`
         });
       }else{
         this.$router.push({

src/router/views/index.js

@@ -825,4 +825,19 @@ export default [{
       }
     ]
   },
+  {
+    path: '/system/businessLock/index',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/system/businessLock/index',
+        name:'模块加锁',
+        meta: {
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/system/businessLock/index')
+      }
+    ]
+  },
 ]

src/views/base/credentials.vue

@@ -125,7 +125,7 @@ export default {
               rules: [{
                 required: true,
                 message: " ",
-                trigger: "blur"
+                trigger: "change"
               }],
               search: true
             }, {

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -213,7 +213,7 @@
                 v-input-limit="0"
                 @input="arrivalQuantityChange(row)"
               ></el-input>
-              <span v-else>{{ row.arrivalQuantity }}</span>
+              <span v-else>{{ row.arrivalQuantity | IntegerFormat }}</span>
             </template>
             <template slot="corpId" slot-scope="{ row, index }">
               <crop-select
@@ -1206,8 +1206,9 @@ export default {
       if (this.goodsActives == 'goods') {
         if (Number(row.actualQuantity) < Number(row.arrivalQuantity)) {
           row.arrivalQuantity = row.actualQuantity
+          row.purchaseTotalAmount = (Number(row.arrivalQuantity) * Number(row.purchaseAmount)).toFixed(2)
+          row.deliveryAmount = (Number(row.arrivalQuantity) * Number(row.price)).toFixed(2)
         }
-        row.deliveryAmount = Number(row.actualQuantity) * Number(row.price)
         this.form.deliveryAmount = 0
         this.form.totalQuantity = 0
         this.contactsData.forEach(item => {
@@ -1229,6 +1230,8 @@ export default {
           this.$message.error('到货数量不能超过出库数量')
           row.arrivalQuantity = 0
         }
+        row.purchaseTotalAmount = (Number(row.arrivalQuantity) * Number(row.purchaseAmount)).toFixed(2)
+        row.deliveryAmount = (Number(row.arrivalQuantity) * Number(row.price)).toFixed(2)
         row.integral = Number(row.integralMultiples) * Number(row.arrivalQuantity)
         this.$set(this.form, 'presenterIntegral' , 0)
         this.goodsShowData.forEach(item => {

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

@@ -62,7 +62,7 @@
       "overHidden": true
     },
     {
-      "label": "规格1",
+      "label": "负荷指数",
       "prop": "typenoOne",
       "search": true,
       "index": 1,
@@ -70,8 +70,8 @@
       "overHidden": true
     },
     {
-      "label": "规格型号",
-      "prop": "itemType",
+      "label": "速级",
+      "prop": "typenoTwo",
       "search": true,
       "index": 1,
       "width": 100,
@@ -134,7 +134,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "prop": "createTime",
-      "search": true,
+      "search": false,
       "index": 1,
       "width": 100,
       "format": "yyyy-MM-dd",

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -341,7 +341,7 @@
               span: 8,
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -356,7 +356,7 @@
               type:"date",
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -346,7 +346,7 @@
               span: 8,
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -354,12 +354,14 @@
             },
             {
               label: '收款日期',
-              prop: 'time',
+              prop: 'settlementDate',
+              format:"yyyy-MM-dd",
+              valueFormat:"yyyy-MM-dd 00:00:00",
               span: 8,
               type:"date",
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }

src/views/system/businessLock/config/mainList.json

@@ -0,0 +1,150 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "searchSpan": 8,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": true,
+  "delBtn": false,
+  "addBtn": true,
+  "addBtnText": "新单",
+  "align": "center",
+  "menuWidth": "120",
+  "menu": true,
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": false,
+  "tip":false,
+  "expand": false,
+  "expandWidth": 38,
+  "column": [
+    {
+      "label": "租户",
+      "prop": "tenantId",
+      "search": true,
+      "type": "select",
+      "searchValue": "000000",
+      "index": 1,
+      "minWidth": 80,
+      "overHidden": true,
+      "dicData": [
+        {
+          "label": "管理组",
+          "value": "000000"
+        },
+        {
+          "label": "达沃特",
+          "value": "681169"
+        },
+        {
+          "label": "金港",
+          "value": "888390"
+        },
+        {
+          "label": "福达",
+          "value": "577435"
+        },
+        {
+          "label": "同海",
+          "value": "096359"
+        },
+        {
+          "label": "通济学校",
+          "value": "511847"
+        }],
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "模块名称",
+      "prop": "moduleName",
+      "search": true,
+      "type": "select",
+      "index": 1,
+      "minWidth": 80,
+      "overHidden": true,
+      "dicData": [
+        {
+          "label": "销售",
+          "value": "xs"
+        },
+        {
+          "label": "采购",
+          "value": "cg"
+        },
+        {
+          "label": "发货",
+          "value": "fh"
+        },
+        {
+          "label": "收货",
+          "value": "sh"
+        },
+        {
+          "label": "收费",
+          "value": "sf"
+        },
+        {
+          "label": "付费",
+          "value": "ff"
+        },
+        {
+          "label": "进项",
+          "value": "jx"
+        },
+        {
+          "label": "销项",
+          "value": "xx"
+        },
+        {
+          "label": "小学部",
+          "value": "xxb"
+        }],
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "是否启动",
+      "prop": "isEnable",
+      "type": "select",
+      "search": true,
+      "overHidden": true,
+      "index": 2,
+      "width": 120,
+      "dicData": [
+        {
+          "label": "否",
+          "value": "0"
+        },
+        {
+          "label": "是",
+          "value": "1"
+        }],
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+   {
+      "label": "备注",
+      "prop": "remark",
+      "index": 4,
+      "overHidden": true
+    }
+  ]
+}

src/views/system/businessLock/index.vue

@@ -0,0 +1,224 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :data="dataList"
+               ref="crud"
+               v-model="form"
+               :page.sync="page"
+               :search.sync="search"
+               :table-loading="loading"
+               :before-open="beforeOpen"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @saveColumn="saveColumn"
+               @resetColumn="resetColumn"
+               @on-load="onLoad">
+      <template slot-scope="scope" slot="moduleName">
+        <span>{{ scope.row.moduleName | moduleNameFormat(moduleOption) }}</span>
+      </template>
+      <template slot-scope="scope" slot="isEnable">
+        <span>{{ scope.row.isEnable == '1'?'是':'否'}}</span>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import option from "./config/mainList.json";
+  import {lockConfigList, lockConfigSave ,lockConfigUpdate ,lockConfigDetail} from "@/api/lock/lock";
+  import {customerList} from "@/api/basicData/inventoryAccount"
+
+  export default {
+    data() {
+      return {
+        loading : false,
+        form: {},
+        search:{},
+        show:true,
+        detailData:{},
+        option: option,
+        parentId:0,
+        dataList: [],
+        page: {
+          currentPage: 1,
+          total: 0,
+          pageSize: 10,
+          pageSizes: [10, 50, 100, 200, 300, 400, 500,1000]
+        },
+        query:{},
+        moduleOption: [
+          {
+            label: '销售',
+            value: 'xs'
+          },
+          {
+            label: '采购',
+            value: 'cg'
+          },
+          {
+            label: '发货',
+            value: 'fh'
+          },
+          {
+            label: '收货',
+            value: 'sh'
+          },
+          {
+            label: '收费',
+            value: 'sf'
+          },
+          {
+            label: '付费',
+            value: 'ff'
+          },
+          {
+            label: '进项',
+            value: 'jx'
+          },
+          {
+            label: '销项',
+            value: 'xx'
+          },
+          {
+            label: '小学部',
+            value: 'xxb'
+          },
+        ]
+      }
+    },
+    async created() {
+      // this.option = await this.getColumnData(this.getColumnName(65), option);
+    },
+    filters: {
+      moduleNameFormat(row, moduleOption) {
+        let name;
+        moduleOption.map((e) => {
+          if (row == e.value) {
+            name = e.label
+          }
+        });
+        return name;
+      },
+    },
+    mounted() {
+    },
+    methods: {
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          lockConfigDetail(this.form.id).then(res => {
+            res.data.data.isEnable = res.data.data.isEnable.toString()
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      rowSave(row, done, loading) {
+        lockConfigSave(row).then(() => {
+          this.onLoad(this.page,this.search);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        lockConfigUpdate(row).then(() => {
+          this.onLoad(this.page,this.search);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        });
+      },
+      rowDel(row, index, done) {
+        if(row.id){
+          this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+
+          });
+        }
+      },
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+      searchReset() {
+        console.log('1')
+      },
+      selectionChange() {
+        console.log('1')
+      },
+      sizeChange(val) {
+        this.page.currentPage = 1;
+        this.page.pageSize = val;
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+        this.onLoad(this.page);
+      },
+      refreshChange() {
+        this.onLoad(this.page);
+      },
+      paramsAdjustment(params) {
+        params = Object.assign({}, this.search);
+        if(!params.tenantId){
+          params.tenantId = '000000'
+        }
+        return params
+      },
+
+      onLoad(page, params) {
+        this.loading = true;
+        params =  this.paramsAdjustment(params)
+
+        lockConfigList(page.currentPage,page.pageSize,params).then(res=>{
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false;
+        })
+      },
+      //列保存触发
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(65),
+          this.option
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        const inSave = await this.delColumnData(
+          this.getColumnName(65),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.option = option;
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/system/dept.vue

@@ -322,7 +322,6 @@
         }
         if (["edit", "view"].includes(type)) {
           getDept(this.form.id).then(res => {
-            console.log(res.data.data)
             this.form = res.data.data;
           });
         }

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -131,10 +131,17 @@
       "width": 100
     },
     {
+      "label": "未知明细收入",
+      "prop": "otheramt",
+      "overHidden": true,
+      "index": 10,
+      "width": 100
+    },
+    {
       "label": "合计金额",
       "prop": "amount",
       "overHidden": true,
-      "index": 10,
+      "index": 11,
       "width": 100,
       "rules": [
         {
@@ -145,18 +152,18 @@
       ]
     },
     {
-      "label": "账户名称",
+      "label": "收款方式",
       "prop": "accountName",
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width": 120
     },
     {
-      "label": "结算日期",
+      "label": "收款日期",
       "prop": "payTime",
       "width": 120,
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "valueFormat": "yyyy-MM-dd",
       "format": "yyyy-MM-dd",
       "type": "date"
@@ -171,7 +178,7 @@
         "value": "dictKey"
       },
       "overHidden": true,
-      "index": 13,
+      "index": 14,
       "width": 100,
       "cell": true
     },
@@ -182,7 +189,7 @@
       "format": "yyyy-MM-dd",
       "type": "date",
       "overHidden": true,
-      "index": 14,
+      "index": 15,
       "width": 100,
       "cell": true
     },
@@ -191,7 +198,7 @@
       "prop": "createUserName",
       "disabled": true,
       "overHidden": true,
-      "index": 15,
+      "index": 16,
       "width": 100
     },
     {
@@ -199,21 +206,21 @@
       "prop": "createTime",
       "disabled": true,
       "overHidden": true,
-      "index": 16,
+      "index": 17,
       "width": 100
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 17,
+      "index": 18,
       "width": 100
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
       "overHidden": true,
-      "index": 18,
+      "index": 19,
       "width": 100
     }
   ]

src/views/workManagement/main-items/detailsPage.vue

@@ -239,6 +239,17 @@
             ></el-input>
             <span v-else>{{ row.matMoney }}</span>
           </template>
+          <template slot="otheramt" slot-scope="{ row }">
+            <el-input
+              v-if="row.$cellEdit"
+              v-model="row.otheramt"
+              placeholder="请输入"
+              size="small"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+              @input="costCount(row)"
+            ></el-input>
+            <span v-else>{{ row.otheramt }}</span>
+          </template>
         </avue-crud>
       </basic-container>
       <containerTitle title="补充信息"></containerTitle>
@@ -773,7 +784,7 @@
       getDeptTree("096359").then(res=>{
         this.optionTable.column.forEach(item=>{
           if(item.prop === "deptid"){
-            item.dicData = res.data.data
+            item.dicData = res.data.data;
           }
         })
       })
@@ -859,6 +870,13 @@
           this.secondDisable = 0
           await  this.switchTab("first")
           this.data = this.data_one  //切换数据
+          getDeptTree("096359").then(res=>{
+            this.optionTable.column.forEach(item=>{
+              if(item.prop === "deptid"){
+                item.dicData = res.data.data;
+              }
+            })
+          })
         } else if(tab.name == "second") {
 
           this.tab1 = false;
@@ -952,9 +970,9 @@
         // if(type==='代垫'){
         //   this.formTwo.matMoney = matMoneyList.reduce((n,m) => n + m)
         // }
-        if(row.serviceCharge && row.matMoney){
-          if(row.amount <  _.add(parseFloat(row.serviceCharge),parseFloat(row.matMoney))){
-            this.$message.error("服务费代垫费不能超过合同金额!")
+        if(row.serviceCharge && row.matMoney  && row.otheramt && row.amount){
+          if(row.amount < (parseFloat(row.serviceCharge) + parseFloat(row.matMoney) + parseFloat(row.otheramt))){
+            this.$message.error("费用之和不能超过合计金额!")
             row.serviceCharge = 0;
             row.matMoney = 0;
           }
@@ -962,8 +980,8 @@
       },
       //费用计算计算
       costCount(row){
-        if(row.serviceCharge && row.matMoney){
-           row.amount = _.add(parseFloat(row.serviceCharge),parseFloat(row.matMoney));
+        if(row.serviceCharge && row.matMoney && row.otheramt){
+          row.amount =  parseFloat(row.serviceCharge) + parseFloat(row.matMoney) + parseFloat(row.otheramt)
         }
       },
       //删除列表后面的删除按钮触发触发(row, index, done)

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -140,6 +140,13 @@
       "width": 120
     },
     {
+      "label": "未知明细收入",
+      "prop": "otheramt",
+      "index": 7,
+      "overHidden": true,
+      "width": 120
+    },
+    {
       "label": "合计金额",
       "prop": "amount",
       "index": 8,