diff --git a/.env.dev b/.env.dev index d865cb4d..d3895be3 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-27 16:17:13 + # @LastEditTime: 2023-11-03 11:16:12 # @LastEditors: DY # @Description: ### @@ -12,14 +12,14 @@ ENV = 'development' VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 - +# VUE_APP_BASE_API = 'http://100.64.0.26:48082' VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080' - +# VUE_APP_BASE_API = 'http://192.168.2.159:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/base/coreCustomer.js b/src/api/base/coreCustomer.js new file mode 100644 index 00000000..b27ffdf0 --- /dev/null +++ b/src/api/base/coreCustomer.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-02 20:25:36 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建客户 +export function createCustomer(data) { + return request({ + url: '/base/core-customer/create', + method: 'post', + data: data + }) +} + +// 更新客户 +export function updateCustomer(data) { + return request({ + url: '/base/core-customer/update', + method: 'put', + data: data + }) +} + +// 删除客户 +export function deleteCustomer(id) { + return request({ + url: '/base/core-customer/delete?id=' + id, + method: 'delete' + }) +} + +// 获得客户 +export function getCustomer(id) { + return request({ + url: '/base/core-customer/get?id=' + id, + method: 'get' + }) +} + +// 获得客户code +export function getCode() { + return request({ + url: '/base/core-customer/getCode', + method: 'get' + }) +} + +// 获得客户分页 +export function getCustomerPage(query) { + return request({ + url: '/base/core-customer/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCustomerList(query) { + return request({ + url: '/base/core-customer/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreDepartment.js b/src/api/base/coreDepartment.js new file mode 100644 index 00000000..5e452bc2 --- /dev/null +++ b/src/api/base/coreDepartment.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-30 14:37:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建部门 +export function createCoreDepartment(data) { + return request({ + url: '/base/core-department/create', + method: 'post', + data: data + }) +} + +// 更新部门 +export function updateCoreDepartment(data) { + return request({ + url: '/base/core-department/update', + method: 'put', + data: data + }) +} + +// 删除部门 +export function deleteCoreDepartment(id) { + return request({ + url: '/base/core-department/delete?id=' + id, + method: 'delete' + }) +} + +// 获得部门 +export function getCoreDepartment(id) { + return request({ + url: '/base/core-department/get?id=' + id, + method: 'get' + }) +} + +// 获得部门code +export function getCode() { + return request({ + url: '/base/core-department/getCode', + method: 'get' + }) +} + +// 获得部门分页 +export function getCoreDepartmentPage(query) { + return request({ + url: '/base/core-department/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreDepartmentList(query) { + return request({ + url: '/base/core-department/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreMajor.js b/src/api/base/coreMajor.js new file mode 100644 index 00000000..3ffad226 --- /dev/null +++ b/src/api/base/coreMajor.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-31 15:11:25 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建专业 +export function createCoreMajor(data) { + return request({ + url: '/base/core-major/create', + method: 'post', + data: data + }) +} + +// 更新专业 +export function updateCoreMajor(data) { + return request({ + url: '/base/core-major/update', + method: 'put', + data: data + }) +} + +// 删除专业 +export function deleteCoreMajor(id) { + return request({ + url: '/base/core-major/delete?id=' + id, + method: 'delete' + }) +} + +// 获得专业 +export function getCoreMajor(id) { + return request({ + url: '/base/core-major/get?id=' + id, + method: 'get' + }) +} + +// 获得专业code +export function getCode() { + return request({ + url: '/base/core-major/getCode', + method: 'get' + }) +} + +// 获得专业分页 +export function getCoreMajorPage(query) { + return request({ + url: '/base/core-major/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreMajorList(query) { + return request({ + url: '/base/core-major/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreSupplier.js b/src/api/base/coreSupplier.js new file mode 100644 index 00000000..390b2d59 --- /dev/null +++ b/src/api/base/coreSupplier.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-03 10:39:44 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建供应商 +export function createCoreSupplier(data) { + return request({ + url: '/base/core-supplier/create', + method: 'post', + data: data + }) +} + +// 更新供应商 +export function updateCoreSupplier(data) { + return request({ + url: '/base/core-supplier/update', + method: 'put', + data: data + }) +} + +// 删除供应商 +export function deleteCoreSupplier(id) { + return request({ + url: '/base/core-supplier/delete?id=' + id, + method: 'delete' + }) +} + +// 获得供应商 +export function getCoreSupplier(id) { + return request({ + url: '/base/core-supplier/get?id=' + id, + method: 'get' + }) +} + +// 获得供应商code +export function getCode() { + return request({ + url: '/base/core-supplier/getCode', + method: 'get' + }) +} + +// 获得供应商分页 +export function getCoreSupplierPage(query) { + return request({ + url: '/base/core-supplier/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorker.js b/src/api/base/coreWorker.js new file mode 100644 index 00000000..823302bc --- /dev/null +++ b/src/api/base/coreWorker.js @@ -0,0 +1,103 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-02 19:49:52 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建员工 +export function createCoreWorker(data) { + return request({ + url: '/base/core-worker/create', + method: 'post', + data: data + }) +} + +// 更新员工 +export function updateCoreWorker(data) { + return request({ + url: '/base/core-worker/update', + method: 'put', + data: data + }) +} + +// 删除员工 +export function deleteCoreWorker(id) { + return request({ + url: '/base/core-worker/delete?id=' + id, + method: 'delete' + }) +} + +// 获得员工 +export function getCoreWorker(id) { + return request({ + url: '/base/core-worker/get?id=' + id, + method: 'get' + }) +} + +// 获得员工code +export function getCode() { + return request({ + url: '/base/core-worker/getCode', + method: 'get' + }) +} + +// 获得员工分页 +export function getCoreWorkerPage(query) { + return request({ + url: '/base/core-worker/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreWorkerList(query) { + return request({ + url: '/base/core-worker/listAll', + method: 'get', + params: query + }) +} + +// 创建员工--专业 +export function createWoBindMa(data) { + return request({ + url: '/base/core-worker-bind-major/create', + method: 'post', + data: data + }) +} + +// 更新员工--专业 +export function updateWoBindMa(data) { + return request({ + url: '/base/core-worker-bind-major/update', + method: 'put', + data: data + }) +} + +// 删除员工--专业 +export function deleteWoBindMa(id) { + return request({ + url: '/base/core-worker-bind-major/delete?id=' + id, + method: 'delete' + }) +} + +// 获得员工--专业分页 +export function getWoBindMaPage(query) { + return request({ + url: '/base/core-worker-bind-major/page', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 4542b5fc..f0c324ea 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -21,11 +21,13 @@ v-model="form[col.prop]" @change="$emit('update', form)" :placeholder="`请输入${col.label}`" + :disabled="disabled" v-bind="col.bind" /> @@ -33,6 +35,7 @@ v-if="col.select" v-model="form[col.prop]" :placeholder="`请选择${col.label}`" + :disabled="disabled" @change="$emit('update', form)" v-bind="col.bind"> @@ -79,6 +87,7 @@ :headers="uploadHeaders" :show-file-list="false" icon="el-icon-upload2" + :disabled="disabled" :before-upload="beforeUpload" :on-success="handleUploadSuccess" v-bind="col.bind"> @@ -98,7 +107,7 @@ v-for="file in form[col.prop] || []" :file="file" :key="file.fileUrl" - @delete="handleDeleteFile(file)" /> + @delete="!disabled && handleDeleteFile(file)" /> @@ -277,7 +286,6 @@ export default { } else if (opt.url) { // 如果有 depends,则暂时先不获取,注册一个watcher if (opt.depends) { - console.log('[handleOptions] setting watch'); this.$watch( () => this.form[opt.depends], (id) => { @@ -300,7 +308,7 @@ export default { }); }, { - immediate: true, + immediate: false, } ); return; diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 44f9cd94..61d46432 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -32,9 +32,28 @@ export default { updateUrl: '', addUrl: '', pageUrl: '', + infoUrl: '', + basePath: '', form: {} }; }, + computed: { + addPath() { + return this.basePath + '/create' + }, + updatePath() { + return this.basePath + '/update' + }, + deletePath() { + return this.basePath + '/delete' + }, + infoPath() { + return this.basePath + '/get' + }, + pagePath() { + return this.basePath + '/page' + } + }, methods: { // utils http(url, method, payload) { @@ -46,16 +65,19 @@ export default { }) }, put(payload) { - return this.http(this.updateUrl, 'put', payload); + return this.http(this.updateUrl == '' ? this.updatePath : this.updateUrl, 'put', payload); }, post(payload) { - return this.http(this.addUrl, 'post', payload); + return this.http(this.addUrl == '' ? this.addPath : this.addUrl, 'post', payload); }, recv(payload) { - return this.http(this.pageUrl, 'get', payload); + return this.http(this.pageUrl == '' ? this.pagePath : this.pageUrl, 'get', payload); }, info(payload) { - return this.http(this.infoUrl, 'get', payload); + return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); + }, + del(payload) { + return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); }, diff --git a/src/utils/dict.js b/src/utils/dict.js index f90ec7c2..ecaafb16 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -99,7 +99,11 @@ export const DICT_TYPE = { ORDER_STATUS: 'order_status', ORDER_ORIGIN: 'order_Origin', ORDER_PRIORITY: 'order_priority', - PACK_SPEC: 'pack_spec' + PACK_SPEC: 'pack_spec', + + // ============== EQUIPMENT - 设备模块 ============= + MAINTAIN_TYPE: 'maintain_type', + FAULT_LEVEL: 'fault-level', } /** diff --git a/src/views/base/coreCustomer/add-or-updata.vue b/src/views/base/coreCustomer/add-or-updata.vue new file mode 100644 index 00000000..8dd236e5 --- /dev/null +++ b/src/views/base/coreCustomer/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue new file mode 100644 index 00000000..20a89f74 --- /dev/null +++ b/src/views/base/coreCustomer/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreDepartment/add-or-updata.vue b/src/views/base/coreDepartment/add-or-updata.vue new file mode 100644 index 00000000..cbf4c943 --- /dev/null +++ b/src/views/base/coreDepartment/add-or-updata.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue new file mode 100644 index 00000000..97b6e59e --- /dev/null +++ b/src/views/base/coreDepartment/index.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/core/base/equipment/components/AssetsUpload.vue b/src/views/base/coreEquipment/components/AssetsUpload.vue similarity index 81% rename from src/views/core/base/equipment/components/AssetsUpload.vue rename to src/views/base/coreEquipment/components/AssetsUpload.vue index 51984a18..bd19723d 100644 --- a/src/views/core/base/equipment/components/AssetsUpload.vue +++ b/src/views/base/coreEquipment/components/AssetsUpload.vue @@ -82,7 +82,7 @@ diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/base/coreEquipmentType/index.vue similarity index 87% rename from src/views/core/base/equipmentType/index.vue rename to src/views/base/coreEquipmentType/index.vue index e640c27a..b5838000 100644 --- a/src/views/core/base/equipmentType/index.vue +++ b/src/views/base/coreEquipmentType/index.vue @@ -70,13 +70,13 @@ export default { return { searchBarKeys: ['name'], tableBtn: [ - this.$auth.hasPermi('base:equipment-type:update') + this.$auth.hasPermi('base:core-equipment-type:update') ? { type: 'edit', btnName: '修改', } : undefined, - this.$auth.hasPermi('base:equipment-type:delete') + this.$auth.hasPermi('base:core-equipment-type:delete') ? { type: 'delete', btnName: '删除', @@ -112,7 +112,7 @@ export default { type: 'separate', }, { - type: this.$auth.hasPermi('base:equipment-type:create') + type: this.$auth.hasPermi('base:core-equipment-type:create') ? 'button' : '', btnName: '新增', @@ -237,25 +237,6 @@ export default { const id = row.id; getEquipmentType(id).then((response) => { this.form = response.data; - // this.form = { - // code: 'SBLX20230925184444000041', - // name: '测试131', - // remark: '测试可删除', - // id: '1706258479729336322', - // files: [ - // { fileName: '1.png', fileUrl: '', fileType: 2 }, - // { fileName: '1.asdfaslkjfkasdf.png', fileUrl: '', fileType: 2 }, - // { fileName: '2.txt', fileUrl: '', fileType: 2 }, - // { fileName: '1.rar', fileUrl: '', fileType: 2 }, - // { fileName: '1.kkk', fileUrl: '', fileType: 2 }, - // { fileName: 'test.file', fileUrl: '', fileType: 2 }, - // { fileName: '222', fileUrl: '', fileType: 2 }, - // { fileName: 'g', fileUrl: '', fileType: 2 }, - // ], - // createTime: 1695638697000, - // parentId: '1701869972319584257', - // }; - // debugger; this.open = true; this.title = '修改设备类型'; }); diff --git a/src/views/base/coreMajor/add-or-updata.vue b/src/views/base/coreMajor/add-or-updata.vue new file mode 100644 index 00000000..b02ea231 --- /dev/null +++ b/src/views/base/coreMajor/add-or-updata.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/base/coreMajor/index.vue b/src/views/base/coreMajor/index.vue new file mode 100644 index 00000000..052af981 --- /dev/null +++ b/src/views/base/coreMajor/index.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/base/coreSupplier/add-or-updata.vue b/src/views/base/coreSupplier/add-or-updata.vue new file mode 100644 index 00000000..f718363c --- /dev/null +++ b/src/views/base/coreSupplier/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue new file mode 100644 index 00000000..3da6699f --- /dev/null +++ b/src/views/base/coreSupplier/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreWorker/add-or-updata.vue b/src/views/base/coreWorker/add-or-updata.vue new file mode 100644 index 00000000..78e959f4 --- /dev/null +++ b/src/views/base/coreWorker/add-or-updata.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/views/base/coreWorker/index.vue b/src/views/base/coreWorker/index.vue new file mode 100644 index 00000000..c5a6ccdf --- /dev/null +++ b/src/views/base/coreWorker/index.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/views/base/equipmentAttr/index.vue b/src/views/base/equipmentAttr/index.vue deleted file mode 100644 index 9696af92..00000000 --- a/src/views/base/equipmentAttr/index.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - diff --git a/src/views/base/equipmentFile/index.vue b/src/views/base/equipmentFile/index.vue deleted file mode 100644 index cb2ebd21..00000000 --- a/src/views/base/equipmentFile/index.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - diff --git a/src/views/base/equipmentQuantityLog/index.vue b/src/views/base/equipmentQuantityLog/index.vue deleted file mode 100644 index b8d5208e..00000000 --- a/src/views/base/equipmentQuantityLog/index.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - diff --git a/src/views/base/equipmentQuantityRealtime/index.vue b/src/views/base/equipmentQuantityRealtime/index.vue deleted file mode 100644 index 6d85dbbe..00000000 --- a/src/views/base/equipmentQuantityRealtime/index.vue +++ /dev/null @@ -1,276 +0,0 @@ - - - diff --git a/src/views/base/equipmentStatusLog/index.vue b/src/views/base/equipmentStatusLog/index.vue deleted file mode 100644 index 5aa1b79a..00000000 --- a/src/views/base/equipmentStatusLog/index.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - diff --git a/src/views/base/equipmentStatusRealtime/index.vue b/src/views/base/equipmentStatusRealtime/index.vue deleted file mode 100644 index 64b6e43f..00000000 --- a/src/views/base/equipmentStatusRealtime/index.vue +++ /dev/null @@ -1,296 +0,0 @@ - - - diff --git a/src/views/base/equipmentTypeFile/index.vue b/src/views/base/equipmentTypeFile/index.vue deleted file mode 100644 index e148348e..00000000 --- a/src/views/base/equipmentTypeFile/index.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/base/packagingPrintLog/add-or-updata.vue index 6acab937..6b1d63b4 100644 --- a/src/views/base/packagingPrintLog/add-or-updata.vue +++ b/src/views/base/packagingPrintLog/add-or-updata.vue @@ -1,7 +1,7 @@ @@ -30,17 +30,15 @@ - - + + - - + + @@ -48,9 +46,8 @@ - - + + @@ -196,10 +193,10 @@ export default { total: 0, }, dataRule: { - code: [ + content: [ { required: true, - message: '产品编码不能为空', + message: '内容不能为空', trigger: 'blur', }, // { @@ -209,11 +206,11 @@ export default { // transfom: 'val => Number(val)', // }, ], - name: [ + workOrderId: [ { required: true, - message: '产品名称不能为空', - trigger: 'blur', + message: '所属工单不能为空', + trigger: 'change', }, ], typeDictValue: [ diff --git a/src/views/base/packagingPrintLog/index.vue b/src/views/base/packagingPrintLog/index.vue index a1f352c0..bb1c27b0 100644 --- a/src/views/base/packagingPrintLog/index.vue +++ b/src/views/base/packagingPrintLog/index.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-01 14:55:51 * @LastEditors: zhp - * @LastEditTime: 2023-10-20 15:05:09 + * @LastEditTime: 2023-10-30 10:44:48 * @Description: -->