台账更新

gaosp

2024-01-18 1d8f5958d044ba2db78102f5c20dad543128a3a0

台账更新

 config/index.js

@@ -1,7 +1,7 @@
/*

 * @Date: 2023-12-20 20:21:29

 * @LastEditors: Sneed

 * @LastEditTime: 2024-01-17 23:53:54

 * @LastEditTime: 2024-01-18 22:47:36

 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/config/index.js

 */

'use strict'

@@ -18,14 +18,14 @@
    assetsPublicPath: '/',

    proxyTable: {

      '/mdc': {

      target: 'http://116.63.148.72:81/',

      target: 'http://116.63.148.72:8088/',

        changeOrigin: true,

        pathRewrite: {

          '^/mdc': '/mdc'

        }

      },

      '/upload': {

        target: 'http://116.63.148.72:81/',

        target: 'http://116.63.148.72:8088/',

        changeOrigin: true,

        pathRewrite: {

          '^/upload': '/upload'


 package-lock.json

@@ -10,7 +10,7 @@
      "license": "MIT",
      "dependencies": {
        "axios": "0.17.1",
        "element-ui": "2.3.4",
        "element-ui": "^2.15.14",
        "expres": "0.0.5",
        "glob": "^7.1.6",
        "highcharts": "^9.0.1",
@@ -618,7 +618,7 @@
    },
    "node_modules/async-validator": {
      "version": "1.8.5",
      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
      "dependencies": {
        "babel-runtime": "6.x"
@@ -2241,7 +2241,6 @@
      "dependencies": {
        "anymatch": "~3.1.2",
        "braces": "~3.0.2",
        "fsevents": "~2.3.2",
        "glob-parent": "~5.1.2",
        "is-binary-path": "~2.1.0",
        "is-glob": "~4.0.1",
@@ -3527,7 +3526,7 @@
    },
    "node_modules/deepmerge": {
      "version": "1.5.2",
      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz",
      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
      "engines": {
        "node": ">=0.10.0"
@@ -3854,18 +3853,19 @@
      "dev": true
    },
    "node_modules/element-ui": {
      "version": "2.3.4",
      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.3.4.tgz",
      "integrity": "sha512-wJij9v2kNn23a1PjsNMviYAQF1yRrHbO9q3yyyJls49tIauJp+DfoESRVXR+l7qhnUKaocvKmHf5fmBoEzZMoQ==",
      "version": "2.15.14",
      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
      "dependencies": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
        "deepmerge": "^1.2.0",
        "normalize-wheel": "^1.0.1",
        "resize-observer-polyfill": "^1.5.0",
        "throttle-debounce": "^1.0.1"
      },
      "peerDependencies": {
        "vue": "^2.5.2"
        "vue": "^2.5.17"
      }
    },
    "node_modules/elliptic": {
@@ -8237,7 +8237,7 @@
    },
    "node_modules/normalize-wheel": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
    },
    "node_modules/normalize.css": {
@@ -13041,6 +13041,11 @@
      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.1.10.tgz",
      "integrity": "sha512-iLcXC8A6Fb0DfA+TRiywrK/0A22bFqkhntjMJMEzXDA4XkcEkfwpNbv7W8iewUiD0xYIaeiXOfiEehTqGKsUFw=="
    },
    "node_modules/resize-observer-polyfill": {
      "version": "1.5.1",
      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
    },
    "node_modules/resolve": {
      "version": "1.22.8",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -14526,7 +14531,7 @@
    },
    "node_modules/throttle-debounce": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==",
      "engines": {
        "node": ">=4"
@@ -15437,10 +15442,8 @@
      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
      "dev": true,
      "dependencies": {
        "chokidar": "^3.4.1",
        "graceful-fs": "^4.1.2",
        "neo-async": "^2.5.0",
        "watchpack-chokidar2": "^2.0.1"
        "neo-async": "^2.5.0"
      },
      "optionalDependencies": {
        "chokidar": "^3.4.1",
@@ -15502,7 +15505,6 @@
        "anymatch": "^2.0.0",
        "async-each": "^1.0.1",
        "braces": "^2.3.2",
        "fsevents": "^1.2.7",
        "glob-parent": "^3.1.0",
        "inherits": "^2.0.3",
        "is-binary-path": "^1.0.0",
@@ -15932,7 +15934,6 @@
      "dependencies": {
        "anymatch": "^1.3.0",
        "async-each": "^1.0.0",
        "fsevents": "^1.0.0",
        "glob-parent": "^2.0.0",
        "inherits": "^2.0.1",
        "is-binary-path": "^1.0.0",
@@ -16609,7 +16610,6 @@
      "dev": true,
      "dependencies": {
        "source-map": "~0.5.1",
        "uglify-to-browserify": "~1.0.0",
        "yargs": "~3.10.0"
      },
      "bin": {
@@ -17531,7 +17531,7 @@
    },
    "async-validator": {
      "version": "1.8.5",
      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
      "requires": {
        "babel-runtime": "6.x"
@@ -20042,7 +20042,7 @@
    },
    "deepmerge": {
      "version": "1.5.2",
      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz",
      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
    },
    "define-data-property": {
@@ -20319,14 +20319,15 @@
      "dev": true
    },
    "element-ui": {
      "version": "2.3.4",
      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.3.4.tgz",
      "integrity": "sha512-wJij9v2kNn23a1PjsNMviYAQF1yRrHbO9q3yyyJls49tIauJp+DfoESRVXR+l7qhnUKaocvKmHf5fmBoEzZMoQ==",
      "version": "2.15.14",
      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
      "requires": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
        "deepmerge": "^1.2.0",
        "normalize-wheel": "^1.0.1",
        "resize-observer-polyfill": "^1.5.0",
        "throttle-debounce": "^1.0.1"
      }
    },
@@ -23790,7 +23791,7 @@
    },
    "normalize-wheel": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
    },
    "normalize.css": {
@@ -27649,6 +27650,11 @@
      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.1.10.tgz",
      "integrity": "sha512-iLcXC8A6Fb0DfA+TRiywrK/0A22bFqkhntjMJMEzXDA4XkcEkfwpNbv7W8iewUiD0xYIaeiXOfiEehTqGKsUFw=="
    },
    "resize-observer-polyfill": {
      "version": "1.5.1",
      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
    },
    "resolve": {
      "version": "1.22.8",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -28874,7 +28880,7 @@
    },
    "throttle-debounce": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
    },
    "through": {

 package.json

@@ -14,7 +14,7 @@
  },
  "dependencies": {
    "axios": "0.17.1",
    "element-ui": "2.3.4",
    "element-ui": "^2.15.14",
    "expres": "0.0.5",
    "glob": "^7.1.6",
    "highcharts": "^9.0.1",

 src/container/ledger/Manage-add-update.vue

@@ -1,14 +1,14 @@
<template>

    <div>

        <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible">

        <el-dialog :title="!dataForm.id ? '新建' : '编辑'" @close="cancel" :close-on-click-modal="false" width="80%" :visible.sync="addVisible">

            <!-- 添加内容-->

            <el-form :model="dataForm" label-width="100px" ref="dataForm">

                <el-row :gutter="20">

                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                    <!-- <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="机床名" prop="machineName">

                            <el-input placeholder="机床名称" clearable></el-input>

                        </el-form-item>

                    </el-col>

                    </el-col> -->

                    <!-- 

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="机床ip" prop="machineIp">

@@ -173,16 +173,16 @@
                        </el-form-item>

                    </el-col>

                    <!--

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="班次" prop="classes">

              <el-select v-model="dataForm.classes" placeholder="---请选择---">

                <el-option value="一班">一班</el-option>

                <el-option value="二班">二班</el-option>

                <el-option value="三班">三班</el-option>

              </el-select>

            </el-form-item>

          </el-col>

          -->

                    <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

                        <el-form-item label="班次" prop="classes">

                        <el-select v-model="dataForm.classes" placeholder="---请选择---">

                            <el-option value="一班">一班</el-option>

                            <el-option value="二班">二班</el-option>

                            <el-option value="三班">三班</el-option>

                        </el-select>

                        </el-form-item>

                    </el-col>

                    -->

                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="生产厂家" prop="manufacturer">

                            <el-input v-model="dataForm.manufacturer" placeholder="生产厂家" clearable></el-input>

@@ -191,26 +191,23 @@
                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="投产日期" prop="productionDate">

                            <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="dataForm.productionDate"

                                type="date" clearable placeholder="选择日期" clearable></el-date-picker>

                                type="date" clearable placeholder="选择日期"></el-date-picker>

                        </el-form-item>

                    </el-col>

                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="设备原值(元)" prop="originalValue"

                            :rules="{ type: 'number', message: '设备原值必须为数字值',trigger: 'change' }">

                            <el-input v-model.number="dataForm.originalValue" placeholder="设备原值" clearable></el-input>

                        <el-form-item label="设备原值(元)" prop="originalValue">

                            <el-input v-model="dataForm.originalValue" :change="checkAmount('originalValue')" placeholder="设备原值" clearable></el-input>

                        </el-form-item>

                    </el-col>



                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="设备净现值(元)" prop="presentValue" :rules="[

                            { type: 'number', message: '设备重量需为数字值' }

                        ]">

                            <el-input v-model.number="dataForm.presentValue" placeholder="设备净现值" clearable></el-input>

                        <el-form-item label="设备净现值(元)" prop="presentValue">

                            <el-input v-model="dataForm.presentValue" :change="checkAmount('presentValue')"  placeholder="设备净现值" clearable></el-input>

                        </el-form-item>

                    </el-col>

                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="设备重量(千克)" prop="weight" :rules="[

                            { type: 'number', message: '设备重量需为数字值' }

                            { type: 'number', message: '设备重量需为数字' }

                        ]">

                            <el-input v-model.number="dataForm.weight" placeholder="设备重量" clearable></el-input>

                        </el-form-item>

@@ -307,16 +304,57 @@
        }

    },

    created() {

        this.init(this.row)

        // this.init(this.row)

    },

    methods: {

        checkAmount (key) {

            let checkPlan = '' + this.dataForm[key]

 
                checkPlan = checkPlan

				
                .replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符

				
                .replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的

				
                .replace(/^\./g, '') // 保证第一个为数字而不是.

				
                .replace('.', '$#$')

				
                .replace(/\./g, '')

				
                .replace('$#$', '.')

				
                if (checkPlan.indexOf('.') < 0 && checkPlan !== '') {

				
                // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额

				
                checkPlan = parseFloat(checkPlan) + ''

				
                } else if (checkPlan.indexOf('.') >= 0) {

				
                checkPlan = checkPlan

				
                .replace(/^()*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数

				
                }

				
                this.dataForm[key] = checkPlan

				
        },

        init(row) {

            debugger

            if (this.$refs['dataForm']) {

                // this.$refs['dataForm'].resetFields()

                this.$refs['dataForm'].resetFields()

            }

            if (row !== undefined) {



            } else { this.dataForm.id = '' }

            if (Object.keys(row).length > 0) {

                Object.keys(row).forEach(key => {

                    this.dataForm[key] = row[key]

                })

            } else { 
                Object.keys(row).forEach(key => {

                    this.dataForm[key] = ''

                })

             }

        },

        /* 查询使用部门*/

        cancel() {

@@ -336,16 +374,22 @@
            }

        },

        /* 提交*/

        dataFormSubmit() {

            this.$refs.dataForm.validate((valid) => {

                if (valid) {

                    alert('submit!');

                } else {

                    console.log('error submit!!');

                    return false;

                }

        async dataFormSubmit() {

            let valid = await new Promise(resolve => {

                this.$refs.dataForm.validate((valid) => {

                    if (valid) {

                        resolve(true)

                    } else {

                        resolve(false)

                        this.$message({

                            type: 'error',

                            message: '验证失败'

                        })

                    }

                })

            })

            return

            if (!valid) return

            // return

            if (!this.dataForm.id) { // 新增

                accountCreate(this.dataForm).then(res => {

                    this.$message({