From c0849bd605b1399aabf51add2c04c775e3c7cbea Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 11 十月 2023 15:26:54 +0800
Subject: [PATCH] new file: src/api/admin/productType.js new file: src/const/crud/admin/productType.js modified: src/const/crud/admin/user.js modified: src/page/index/logo.vue new file: src/views/admin/productType/index.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/masterproductionschedule/index.vue modified: vue.config.js
---
src/views/plan/masterproductionschedule/index.vue | 4
src/views/admin/productType/index.vue | 205 +++++++++++++++++
src/views/plan/manufacturingorder/index.vue | 4
src/api/admin/productType.js | 49 ++++
vue.config.js | 2
src/views/plan/customerorder/index.vue | 62 ++--
src/const/crud/admin/user.js | 4
src/views/plan/customerorder/customerorder-form.vue | 314 +------------------------
src/const/crud/admin/productType.js | 39 +++
src/page/index/logo.vue | 2
10 files changed, 349 insertions(+), 336 deletions(-)
diff --git a/src/api/admin/productType.js b/src/api/admin/productType.js
new file mode 100644
index 0000000..2c2f690
--- /dev/null
+++ b/src/api/admin/productType.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018-2025, ztt All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: ztt
+ */
+
+import request from '@/router/axios'
+
+export function getList(query) {
+ return request({
+ url: '/mes/customerOrderStaff/show',
+ method: 'get',
+ params: query
+ })
+}
+
+export function chooseStaff(query) {
+ return request({
+ url: '/mes/customerOrderStaff/chooseStaff',
+ method: 'get',
+ params: query
+ })
+ }
+
+export function addObj(obj) {
+ return request({
+ url: '/mes/customerOrderStaff/add',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function delObj(obj) {
+ return request({
+ url: '/mes/customerOrderStaff/'+obj,
+ method: 'delete',
+ })
+}
\ No newline at end of file
diff --git a/src/const/crud/admin/productType.js b/src/const/crud/admin/productType.js
new file mode 100644
index 0000000..77a330c
--- /dev/null
+++ b/src/const/crud/admin/productType.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018-2025, ztt All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: ztt
+ */
+export const tableOption = {
+ border: true,
+ index: true,
+ indexLabel: '搴忓彿',
+ stripe: true,
+ menuAlign: 'center',
+ searchMenuSpan: 6,
+ editBtn: false,
+ delBtn: false,
+ align: 'center',
+ addBtn: false,
+ viewBtn: false,
+ column: [{
+ label: '鐢ㄦ埛',
+ prop: 'staffName',
+ type: 'select',
+ span: 24,
+ }, {
+ label: '绫诲瀷鍏抽敭瀛�',
+ prop: 'type',
+ span: 24,
+ }]
+}
diff --git a/src/const/crud/admin/user.js b/src/const/crud/admin/user.js
index 055934f..1082aaf 100644
--- a/src/const/crud/admin/user.js
+++ b/src/const/crud/admin/user.js
@@ -125,7 +125,7 @@
rules: [{
required: true,
message: '璇烽�夋嫨瑙掕壊',
- trigger: 'blur'
+ trigger: 'change'
}]
}, {
label: '鐘舵��',
@@ -137,7 +137,7 @@
rules: [{
required: true,
message: '璇烽�夋嫨鐘舵��',
- trigger: 'blur'
+ trigger: 'change'
}],
dicData: [{
label: '鏈夋晥',
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 6c143cb..c9c78f0 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -11,7 +11,7 @@
style="width: 220px;"
src="/images/Sun-Mes-Logo-Normal.png"
/></span>-->
- <div key="1" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
+ <div key="2" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
<!-- <el-image
v-if="logSrc != null"
style="width:200px;position: absolute;"
diff --git a/src/views/admin/productType/index.vue b/src/views/admin/productType/index.vue
new file mode 100644
index 0000000..0c8df7f
--- /dev/null
+++ b/src/views/admin/productType/index.vue
@@ -0,0 +1,205 @@
+<!--
+ - Copyright (c) 2018-2025, ztt All rights reserved.
+ -
+ - Redistribution and use in source and binary forms, with or without
+ - modification, are permitted provided that the following conditions are met:
+ -
+ - Redistributions of source code must retain the above copyright notice,
+ - this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ - notice, this list of conditions and the following disclaimer in the
+ - documentation and/or other materials provided with the distribution.
+ - Neither the name of the pig4cloud.com developer nor the names of its
+ - contributors may be used to endorse or promote products derived from
+ - this software without specific prior written permission.
+ - Author: ztt
+ -->
+
+ <template>
+ <div class="app-container calendar-list-container">
+ <basic-container>
+ <avue-crud
+ ref="crud"
+ :option="tableOption"
+ :data="list"
+ :page="page"
+ v-model="form"
+ :table-loading="listLoading"
+ @on-load="getList"
+ @search-change="searchChange"
+ @refresh-change="refreshChange"
+ @size-change="sizeChange"
+ @current-change="currentChange">
+ <template slot="staffName" slot-scope="scope">{{ scope.row.staffName }}</template>
+ <template slot="type" slot-scope="scope">{{ scope.row.type }}</template>
+ <template slot="menuLeft">
+ <el-button
+ v-if="prodManager_btn_add"
+ class="filter-item"
+ type="primary"
+ icon="el-icon-plus"
+ @click="dialogAddVisible=true">娣诲姞</el-button>
+ </template>
+ <template slot="menu" slot-scope="scope">
+ <el-button
+ v-if="prodManager_btn_del"
+ type="text"
+ size="small"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row,scope.index)">鍒犻櫎
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+ <el-dialog :visible.sync="dialogAddVisible" :close-on-click-modal="false" title="鏂板閰嶇疆">
+ <el-form :model="prodForm" :rules="rules" ref="addDialog">
+ <el-form-item prop="staffName" label="鐢ㄦ埛鍚嶇О:" label-width="90px">
+ <el-select style="width:100%" v-model="prodForm.staffName">
+ <el-option v-for="(item,index) in staffNamesOptions" :key="index" :value="item.id" :label="item.staffName"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="type" label="绫诲瀷鍏抽敭瀛�:" label-width="90px">
+ <el-input style="width:100%" v-model="prodForm.type" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨嬪叧閿瓧"/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer"
+ class="dialog-footer">
+ <el-button type="primary" size="small" @click="createConfirm">纭� 璁�</el-button>
+ <el-button type="default" size="small" @click="reset">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+ </div>
+ </template>
+
+ <script>
+ import { tableOption } from '@/const/crud/admin/productType'
+ import { getList,addObj,delObj,chooseStaff } from '@/api/admin/productType'
+ import { mapGetters } from 'vuex'
+
+ export default {
+ name: 'TableProduct',
+ data() {
+ return {
+ dialogAddVisible: false,
+ prodForm: {
+ staffName: '',
+ type: ''
+ },
+ rules: {
+ staffName:[{ required:true,message:"鐢ㄦ埛鍚嶄笉鑳戒负绌�", trigger: 'change' }],
+ type:[{required:true,message:"浜у搧绫诲瀷鍏抽敭瀛椾笉鑳戒负绌�", trigger: 'blur'}]
+ },
+ staffNamesOptions: [],
+ tableOption: tableOption,
+ page: {
+ total: 0, // 鎬婚〉鏁�
+ currentPage: 1, // 褰撳墠椤垫暟
+ pageSize: 20 // 姣忛〉鏄剧ず澶氬皯鏉�
+ },
+ list: [],
+ listLoading: false,
+ form: {},
+ prodManager_btn_add: false,
+ prodManager_btn_del: false,
+ }
+ },
+ created() {
+ this.prodManager_btn_add = this.permissions['sys_prod_add']
+ this.prodManager_btn_del = this.permissions['sys_prod_del']
+ this.getStaffList()
+ },
+ computed: {
+ ...mapGetters(['elements', 'permissions'])
+ },
+ methods: {
+ getStaffList(){
+ chooseStaff(Object.assign({})).then(response => {
+ this.staffNamesOptions = response.data.data
+ })
+ },
+ getList(page, params) {
+ this.listLoading = true
+ getList(Object.assign({
+ current: page.currentPage,
+ size: page.pageSize
+ }, params, this.searchForm)).then(response => {
+ this.list = response.data.data
+ this.page.total = response.data.data.total
+ this.listLoading = false
+ }).catch(() => {
+ this.listLoading = false
+ })
+ },
+ refreshChange() {
+ this.getList(this.page)
+ },
+ searchChange(form, done) {
+ this.searchForm = form
+ this.page.currentPage = 1
+ this.getList(this.page, form)
+ done()
+ },
+ sizeChange(pageSize){
+ this.page.pageSize = pageSize
+ },
+ currentChange(current){
+ this.page.currentPage = current
+ },
+ handleCreate() {
+ this.$refs.crud.rowAdd()
+ },
+ createConfirm(){
+ this.$refs['addDialog'].validate(val=>{
+ if(val){
+ addObj({
+ staffId: this.prodForm.staffName,
+ productType: this.prodForm.type
+ }).then(response => {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.refreshChange();
+ }).catch(() => {
+ this.$message.error("娣诲姞澶辫触")
+ })
+ }
+ })
+ },
+ reset(){
+ this.dialogAddVisible =false;
+ this.$refs['addDialog'].resetFields()
+ },
+ handleDelete(row, index) {
+ this.$confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.staffName + '"' + '"鐨勬暟鎹」?', '璀﹀憡', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ closeOnClickModal:false,
+ type: 'warning'
+ }).then(function() {
+ return delObj(row.id)
+ }).then(() => {
+ this.getList(this.page)
+ this.$notify.success('鍒犻櫎鎴愬姛')
+ })
+ },
+ }
+ }
+ </script>
+
+ <style lang="scss" scoped>
+ .el-dialog__wrapper {
+ .el-dialog {
+ width: 61% !important;
+ .dialog-main-tree {
+ max-height: 400px;
+ overflow-y: auto;
+ }
+ }
+ .el-form-item__label {
+ width: 100px !important;
+ padding-right: 20px;
+ }
+ .el-form-item__content {
+ margin-left: 200px !important;
+ }
+ }
+ </style>
+
\ No newline at end of file
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index d4c5731..b56d973 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -88,7 +88,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo">
<el-input
v-model="dataForm.customerPartNo"
@@ -96,7 +96,7 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="IFS琛屽彿" prop="ifsLineNo">-->
<!-- <el-input-->
@@ -125,7 +125,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="琛屽彿" prop="coLineNo">
<el-input
v-model="dataForm.coLineNo"
@@ -133,8 +133,8 @@
:disabled="!ediSource"
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName">
<el-input
v-model="dataForm.customerPartName"
@@ -142,7 +142,7 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<!-- <el-row>-->
@@ -178,7 +178,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瀹㈡埛闆朵欢鍚嶇О" prop="productName">
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input
v-model="dataForm.productName"
placeholder=""
@@ -282,7 +282,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="瀹㈡埛闆朵欢瑙勬牸" prop="customerPartSpec">
<el-input
v-model="dataForm.customerPartSpec"
@@ -290,7 +290,7 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="浜嬩笟閮�" prop="division">-->
<!-- <el-input-->
@@ -302,7 +302,7 @@
<!-- </el-col>-->
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="鍗板瓧鏂瑰紡" prop="printType">
<el-input
v-model="dataForm.printType"
@@ -328,7 +328,7 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
<el-input
@@ -396,7 +396,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="鏈�缁堝鎴�" prop="remark">
<el-input
v-model="dataForm.finalCustomerName"
@@ -404,8 +404,8 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="浜у搧鍒嗙粍" prop="remark">
<el-input
v-model="dataForm.productGroup"
@@ -413,7 +413,7 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="6">
@@ -498,7 +498,7 @@
</el-row>
</el-card>
</el-tab-pane>
- <el-tab-pane label="闄勪欢" type="card">
+ <el-tab-pane label="OTC闄勪欢" type="card">
<el-table :data="fileList" style="width: 100%" height="500">
<el-table-column prop="original" label="鏂囦欢鍚�" align="center">
</el-table-column>
@@ -716,7 +716,7 @@
</el-col>
</el-row>
</el-tab-pane>
- <el-tab-pane label="宸ヨ壓闄勪欢" type="card">
+ <el-tab-pane label="闄勪欢涓婁紶" type="card">
<div style="display: flex;justify-content:flex-end;">
<div></div>
</div>
@@ -815,286 +815,6 @@
</template>
</el-table-column>
</el-table>
- </el-tab-pane>
- <el-tab-pane
- label="宸ヨ壓閰嶇疆鍗�"
- type="card"
- style="height: 650px;overflow-y: auto"
- >
- <div
- style="margin: 5px 20px;display: flex;justify-content:space-between;"
- >
- <el-radio-group
- v-model="configContent.modelType"
- :disabled="configContent.id ? true : false"
- @change="changeModal"
- >
- <el-radio v-model="radio" label="01">妯℃澘1</el-radio>
- <el-radio v-model="radio" label="02">妯℃澘2</el-radio>
- </el-radio-group>
-
- <span style="right: 0;">
- <el-button
- :disabled="!configContent.id"
- type="danger"
- size="mini"
- v-thinclick="`deleteConfig`"
- >
- 鍒犻櫎
- </el-button>
- <el-button type="success" size="mini" v-thinclick="`saveConfig`">
- 淇濆瓨
- </el-button>
- <el-button
- type="success"
- size="mini"
- v-thinclick="`saveConfigForAll`"
- >
- 淇濆瓨骞跺簲鐢ㄨ嚦鍏朵粬璁㈠崟琛�
- </el-button>
- </span>
- </div>
- <el-divider content-position="left">閰嶇疆鍗曞唴瀹�</el-divider>
- <!--妯℃澘1-->
- <div
- class="node-content-remark"
- v-if="configContent.modelType == configTypes[0].value"
- >
- <el-form
- class="configform1"
- :inline="true"
- ref="form"
- label-width="80px"
- >
- <el-form-item label="璁㈠崟缂栧彿">
- <el-input v-model="configContent.proNo" readonly></el-input>
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
- <el-input v-model="configContent.proName" readonly></el-input>
- </el-form-item>
- </el-form>
- <!-- 鐢熶骇瑕佹眰鎻忚堪锛�-->
- <rich-text
- editor-id="editor1"
- :richContent="configContent.remark1"
- @contentChange="setConfigRemark1"
- placeholder="璇疯緭鍏ョ敓浜ц姹傛弿杩�"
- ></rich-text>
- <!-- 鍗板瓧涓句緥锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor2"-->
- <!-- :richContent="configContent.remark2"-->
- <!-- @contentChange="setConfigRemark2"-->
- <!-- placeholder="璇疯緭鍏ュ嵃瀛椾妇渚�"-->
- <!-- ></rich-text>-->
- <!-- 娉ㄦ剰锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor3"-->
- <!-- :richContent="configContent.remark3"-->
- <!-- @contentChange="setConfigRemark3"-->
- <!-- placeholder="璇疯緭鍏ユ敞鎰�"-->
- <!-- ></rich-text>-->
- <!-- 澶囨敞锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor4"-->
- <!-- :richContent="configContent.remark4"-->
- <!-- @contentChange="setConfigRemark4"-->
- <!-- placeholder="璇疯緭鍏ュ娉�"-->
- <!-- ></rich-text>-->
- </div>
-
- <!--妯℃澘2-->
- <div
- class="node-content-remark"
- v-if="configContent.modelType == configTypes[1].value"
- >
- <div
- class="node-content-remark2"
- style="width: 80%;margin-left: 30px;"
- >
- <el-button type="primary" size="mini" @click="getHistoryData"
- >鑾峰彇</el-button
- >
- <el-form
- class="configform2"
- :inline="true"
- ref="form"
- label-width="80px"
- >
- <el-form-item label="鍚堝悓缂栧彿锛�" style="width: 40%">
- <el-input v-model="configContent.proNo" readonly></el-input>
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О锛�" style="width: 40%">
- <el-input v-model="configContent.proName"></el-input>
- </el-form-item>
- <el-form-item label="鍗板瓧瑕佹眰锛�" style="width: 100%">
- <el-input v-model="configContent.printReq"></el-input>
- </el-form-item>
- </el-form>
- <rich-text
- placeholder="鐢熶骇瑙勬牸鍨嬪彿鍙婃暟閲�"
- editor-id="editorb1"
- :richContent="configContent.remark1"
- @contentChange="setConfigRemark1"
- ></rich-text>
- <rich-text
- placeholder="鐢熶骇瑕佹眰鎻忚堪"
- editor-id="editorb2"
- :richContent="configContent.remark2"
- @contentChange="setConfigRemark2"
- ></rich-text>
- <el-form-item label="瀹為檯鍗板瓧瑕佹眰锛�" style="width: 80%">
- <el-input v-model="configContent.realPrintReq"></el-input>
- </el-form-item>
- <el-row class="bodyrow">
- <el-col :span="5">
- <div class="param-top">
- <div class="form-item" style="text-align: left">
- <label>鍙戞场缂嗚姱(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input v-model="configContent.cableCore"></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div style="text-align: right;padding-right: 20px">
- 鎶ゅ妯″叿锛�
- </div>
- </el-col>
- <el-col :span="3">
- <div class="param-top">
- <div class="form-item">
- <label>妯¤姱(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input v-model="configContent.modelCore"></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div class="param-top">
- <div class="form-item">
- <label>妯″(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.modelSleeve"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3"
- ><div class="param-top">
- <div class="form-item">
- <label>瀹氬緞妯�(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.sizingModel"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3"
- ><div class="param-top">
- <div class="form-item">
- <label>杩囨ā(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.strandModel"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- </el-row>
-
- <!-- <rich-text-->
- <!-- placeholder="浜у搧鐨勬�ц兘瑕佹眰"-->
- <!-- editor-id="editorb3"-->
- <!-- :richContent="configContent.remark3"-->
- <!-- @contentChange="setConfigRemark3"-->
- <!-- ></rich-text>-->
- <div>
- 浜у搧鐨勬�ц兘瑕佹眰锛�20鈩冩椂鐨勭數姘旂壒寰�
- </div>
-
- <el-table
- :data="configContent.processConfigDataList"
- style="width: 100%;margin-top: 10px"
- border
- >
- <el-table-column prop="date" label="棰戠巼(MHz)">
- <template slot-scope="scope">
- <el-input v-model="scope.row.frequency"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="鏈�澶т紶閫佽“鍑�(dB/km)">
- <template slot-scope="scope">
- <el-input v-model="scope.row.deliveryReduce"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="province"
- label="鑰﹀悎鎹熻�梞ax(dB),2绫�,95%"
- >
- <template slot-scope="scope">
- <el-input v-model="scope.row.couplingLoss"></el-input>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="120">
- <template slot-scope="scope">
- <el-button
- @click.native.prevent="deleteConfigTableRow(scope.$index)"
- type="text"
- size="small"
- >
- 鍒犻櫎
- </el-button>
- <el-button
- v-if="
- scope.$index ==
- configContent.processConfigDataList.length - 1
- "
- @click.native.prevent="addConfigTableRow(scope.$index)"
- type="text"
- size="small"
- >
- 鏂板
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-form-item
- label="宸ヤ綔棰戝甫鍐呴┗娉㈡瘮锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.workFrequency"></el-input>
- </el-form-item>
- <el-form-item
- label="棰戠巼鑼冨洿锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.frequencyRange"></el-input>
- </el-form-item>
- <el-form-item
- label="鐩存祦鐢甸樆锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.resistance"></el-input>
- </el-form-item>
- <rich-text
- placeholder="璇疯緭鍏�"
- editor-id="editorb4"
- :richContent="configContent.remark4"
- @contentChange="setConfigRemark4"
- ></rich-text>
- </div>
- </div>
</el-tab-pane>
</el-tabs>
</el-form>
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index e0d3b29..c061cf7 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -64,13 +64,13 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.customerorder_push_otc"
style="margin-left:10px;"
type="primary"
@click="pushOtc"
>鎺ㄩ�丒RP</el-button
- >
+ > -->
<el-button
style="margin-left:10px;"
type="primary"
@@ -1011,24 +1011,24 @@
],
toolbar: [],
operator: [
- {
- text: '璁㈠崟璇存槑',
- type: 'text',
- size: 'small',
- fun: this.openCustomerOrder
- },
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
- {
- text: '绠辩爜淇℃伅瀵煎嚭',
- type: 'text',
- size: 'small',
- fun: this.packageExportHandle
- },
+ // {
+ // text: '璁㈠崟璇存槑',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.openCustomerOrder
+ // },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
+ // {
+ // text: '绠辩爜淇℃伅瀵煎嚭',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.packageExportHandle
+ // },
{
text: '浣滃簾',
type: 'text',
@@ -1227,16 +1227,16 @@
permitArr: []
})
}
- if (this.permissions.customerorder_ifs_line) {
- this.table.toolbar.push({
- text: '鑾峰彇ERP琛屽彿',
- type: 'primary',
- fun: this.pullIfsLineNo,
- disabled: false,
- permitArr: [],
- loading: false
- })
- }
+ // if (this.permissions.customerorder_ifs_line) {
+ // this.table.toolbar.push({
+ // text: '鑾峰彇ERP琛屽彿',
+ // type: 'primary',
+ // fun: this.pullIfsLineNo,
+ // disabled: false,
+ // permitArr: [],
+ // loading: false
+ // })
+ // }
if (this.permissions.customerorder_submit_oa) {
this.table.toolbar.push({
text: '鎻愪氦瀹℃牳',
@@ -1274,7 +1274,7 @@
prop: 'coState',
searchInfoType: 'select',
// propVal: '01partUnCheck'
- propVal: '02technologyUnCheck'
+ // propVal: '02technologyUnCheck'
})
)
this.$refs.customerOrderTable.setQueryParam(queryParam)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7ba7935..904f5d4 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -65,7 +65,7 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_orderto_ifs"
@click="commitOrderIfs()"
type="primary"
@@ -88,7 +88,7 @@
style="margin-left:10px;"
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
- </el-button>
+ </el-button> -->
<el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index b88c6f4..988e12c 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -90,7 +90,7 @@
:loading="loadingOa"
>鎻愪氦OA
</el-button>
- <el-button
+ <!-- <el-button
v-if="permissions.masterproductionschedule_sync_scm"
@click="syncScm()"
type="primary"
@@ -103,7 +103,7 @@
type="primary"
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
- </el-button>
+ </el-button> -->
</template>
</ttable>
diff --git a/vue.config.js b/vue.config.js
index 7150ce3..64b6d3b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://ztt-gateway:9999'
+const url = 'http://192.168.0.23:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3