yangys
2024-03-05 28474e118d114a6259b8b66998b41a0cd9d09a97
修改台账bug
已修改3个文件
32 ■■■■ 文件已修改
src/api/Api.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/ledger/Manage-add-update.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/ledger/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/Api.js
@@ -184,7 +184,10 @@
        url: '/usedepartment/delete',
        method: 'POST'
    },
    countryList:  {
        url: '/account/countries',
        method: 'GET'
    },
    
}
// 正式环境配置地址
src/container/ledger/Manage-add-update.vue
@@ -54,7 +54,7 @@
            </el-form-item>
          </el-col> -->
                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
                        <el-form-item label="统一编码" prop="uuid">
                        <el-form-item label="统一编号" prop="uuid">
                            <el-input v-model="dataForm.uuid" placeholder="统一编码" clearable></el-input>
                        </el-form-item>
                    </el-col>
@@ -161,7 +161,14 @@
                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
                        <el-form-item label="国别" prop="country">
                        <!--
                            <el-input v-model="dataForm.country" placeholder="国别" clearable></el-input>
                            -->
                            <el-select v-model="dataForm.country" clearable>
                                <el-option v-for="item in countrylist" :key="item.label" :label="item.label"
                                    :value="item.label">
                                </el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
@@ -249,7 +256,7 @@
<script>
import { accountUpdate, accountCreate } from '@/api/Api'
export default {
    props: ['addVisible', 'deviceType', 'departmentlist', 'row', 'isselectlist', 'deviceStatus', 'financePro', 'deviceTypeIds'],
    props: ['addVisible', 'deviceType', 'departmentlist', 'row', 'isselectlist', 'deviceStatus', 'financePro', 'deviceTypeIds','countrylist'],
    data() {
        return {
            visible: false,
src/container/ledger/index.vue
@@ -90,7 +90,7 @@
                </el-table-column>
                <el-table-column label="设备规格" align="center" prop="specification">
                </el-table-column>
                <el-table-column label="设备型号" align="center" prop="category">
                <el-table-column label="设备型号" align="center" prop="type">
                </el-table-column>
                <!-- <el-table-column
                label="设备管理分类"
@@ -104,7 +104,7 @@
            </el-table-column> -->
                <el-table-column label="使用部门" align="center" prop="departmentName">
                </el-table-column>
                <el-table-column label="设备类型" align="center" prop="category">
                <el-table-column label="加工类型" align="center" prop="category">
                </el-table-column>
                <el-table-column label="设备状态" align="center" prop="state">
                    <template slot-scope="scope">
@@ -146,7 +146,7 @@
        </List>
        <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
            :deviceType="deviceType" :departmentlist="departmentlist" :isselectlist="isselectlist"
            :deviceStatus="deviceStatus" :financePro="financePro" :deviceTypeIds="deviceTypeIds" :row="row"></manage-add-update>
            :deviceStatus="deviceStatus" :financePro="financePro" :deviceTypeIds="deviceTypeIds" :countrylist="countrylist" :row="row"></manage-add-update>
    </div>
</template>
<script>
@@ -198,6 +198,7 @@
                { value: '帐外', label: '帐外' }
            ],
            departmentlist: [],
            countrylist: [],//国别
            queryInfo: {
                date: [],
                uuid: '',
@@ -237,6 +238,15 @@
            getRequest('deviceTypeList').then(res => {
                this.deviceTypeIds = res.data || []
            })
            getRequest('countryList').then(res => {
                this.countrylist  = res.data.map(item => {
                    return {
                        value: item.id,
                        label: item.name
                    }
                });
            })
        },
        query() {
            try {