From 2e73213025061f966df1aca2e290bb48b148155b Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期三, 25 十月 2023 10:39:38 +0800 Subject: [PATCH] 改 --- vue.config.js | 3 ++- src/views/technology/routing/routing-form.vue | 12 ++++++------ src/views/technology/structure/single-structure-form.vue | 12 ++++++------ src/views/technology/document/document-form.vue | 4 ++-- src/views/technology/document/index.vue | 4 ++-- src/views/technology/routing/index.vue | 4 ++-- src/views/technology/operation/operation-form.vue | 8 ++++---- src/views/technology/structure/index.vue | 4 ++-- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue index 81ffb96..87668af 100644 --- a/src/views/technology/document/document-form.vue +++ b/src/views/technology/document/document-form.vue @@ -61,7 +61,7 @@ ></el-input> </el-form-item> </el-col> - <el-col :span="3"> + <!-- <el-col :span="3"> <el-form-item prop="sheathColor" label="鎶ゅ棰滆壊"> <el-input v-model="dataForm.sheathColor" @@ -76,7 +76,7 @@ placeholder="缁濈紭棰滆壊" ></el-input> </el-form-item> - </el-col> + </el-col> --> <!-- <el-col :span="4"> <el-form-item label="椤圭洰鍙�" prop="projectNo"> <el-input diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue index c642dc1..c746080 100644 --- a/src/views/technology/document/index.vue +++ b/src/views/technology/document/index.vue @@ -11,9 +11,9 @@ ref="documentTable" > <template #toolbar> - <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs" + <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs" >ERP鍚屾</el-button - > + > --> <el-button type="primary" @click="deleteBatch" diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue index 7c8b026..33e6e9a 100644 --- a/src/views/technology/operation/operation-form.vue +++ b/src/views/technology/operation/operation-form.vue @@ -173,9 +173,9 @@ key="autoInspection" >鑷姩鎶ユ</el-checkbox-button > - <el-checkbox-button label="semiFinished" key="semiFinished" + <!-- <el-checkbox-button label="semiFinished" key="semiFinished" >鍗婃垚鍝�</el-checkbox-button - > + > --> <el-checkbox-button label="materialCost" key="materialCost" >鎶曟枡</el-checkbox-button > @@ -307,7 +307,7 @@ </el-table> </el-card> </el-tab-pane> - <el-tab-pane + <!-- <el-tab-pane v-if="isShowStepBusiness" label="宸ユ" style="height: 100%" @@ -363,7 +363,7 @@ </el-table-column> </el-table> </el-card> - </el-tab-pane> + </el-tab-pane> --> </el-tabs> <ParamTemplateDialog :currshowlist.sync="showOperationTemplate" diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue index 87bf396..4354cf2 100644 --- a/src/views/technology/routing/index.vue +++ b/src/views/technology/routing/index.vue @@ -13,13 +13,13 @@ ref="routingTable" > <template #toolbar> - <el-button + <!-- <el-button v-if="permissions.technology_routing_ifssync" type="primary" :loading="ifsSynsLoading" @click="syncIfs" >IFS鍚屾</el-button - > + > --> <el-button v-if="permissions.technology_routing_advancecalc" type="primary" diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue index af7f6b3..5aa9cf5 100644 --- a/src/views/technology/routing/routing-form.vue +++ b/src/views/technology/routing/routing-form.vue @@ -58,13 +58,13 @@ style="width: 280px" ></el-input> </el-form-item> - <el-form-item prop="wireCore" label="绾胯姱"> + <!-- <el-form-item prop="wireCore" label="绾胯姱"> <el-input v-model="dataForm.wireCore" placeholder="绾胯姱" style="width: 60px" ></el-input> - </el-form-item> + </el-form-item> --> <el-form-item label="BOM" prop="bomId"> <el-select v-model="dataForm.bomId" placeholder="" filterable> <el-option @@ -97,7 +97,7 @@ </el-option> </el-select> </el-form-item> - <el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate"> + <!-- <el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate"> <el-date-picker v-model="dataForm.phaseInDate" style="width: 100%" @@ -114,8 +114,8 @@ value-format="yyyy-MM-dd HH:mm:ss" > </el-date-picker> - </el-form-item> - <el-form-item prop="alternativeNo" label="鏇夸唬"> + </el-form-item> --> + <!-- <el-form-item prop="alternativeNo" label="鏇夸唬"> <el-input v-model="dataForm.alternativeNo" placeholder="鏇夸唬" @@ -135,7 +135,7 @@ </el-form-item> <el-form-item label="涓诲伐鑹�" prop="master"> <el-switch v-model="dataForm.master"> </el-switch> - </el-form-item> + </el-form-item> --> </el-col> </el-row> </el-form> diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue index ef5f8fe..0538871 100644 --- a/src/views/technology/structure/index.vue +++ b/src/views/technology/structure/index.vue @@ -13,9 +13,9 @@ ref="structureTable" > <template #toolbar> - <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs" + <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs" >ERP鍚屾</el-button - > + > --> </template> </ttable> <!-- 寮圭獥, 鏂板 / 淇敼 --> diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue index 13e7cd0..834fbaf 100644 --- a/src/views/technology/structure/single-structure-form.vue +++ b/src/views/technology/structure/single-structure-form.vue @@ -59,7 +59,7 @@ </el-option> </el-select> </el-form-item> - <el-form-item label="鏇夸唬" prop="alternativeNo"> + <!-- <el-form-item label="鏇夸唬" prop="alternativeNo"> <el-input v-model="dataForm.alternativeNo"></el-input> </el-form-item> <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc"> @@ -68,7 +68,7 @@ :autosize="{ minRows: 1, maxRows: 3 }" v-model="dataForm.alternativeDesc" ></el-input> - </el-form-item> + </el-form-item> --> <el-form-item label="鐗堟湰鍙�" prop="version"> <el-input v-model="dataForm.version" disabled></el-input> </el-form-item> @@ -79,12 +79,12 @@ v-model="dataForm.remark" ></el-input> </el-form-item> - <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync"> + <!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync"> <span style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;" >{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span > - </el-form-item> + </el-form-item> --> <el-form-item label="榛樿缁撴瀯" prop="master"> <el-checkbox v-model="dataForm.master"></el-checkbox> </el-form-item> @@ -192,7 +192,7 @@ <el-table-column label="鍗曚綅" prop="unit" align="center"> </el-table-column> - <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center"> + <!-- <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center"> <template slot-scope="scope"> <el-input size="small" @@ -206,7 +206,7 @@ </template> </el-table-column> <el-table-column label="鍥惧彿" prop="drawingNumber" align="center"> - </el-table-column> + </el-table-column> --> <el-table-column align="center" label="鎿嶄綔" width="85px"> <template slot-scope="scope"> <el-button diff --git a/vue.config.js b/vue.config.js index 7150ce3..2921129 100644 --- a/vue.config.js +++ b/vue.config.js @@ -2,7 +2,8 @@ * 閰嶇疆鍙傝��: * https://cli.vuejs.org/zh/config/ */ -const url = 'http://ztt-gateway:9999' +//const url = 'http://ztt-gateway:9999' +const url = 'http://192.168.0.15:9999' const localUrl = 'http://localhost:8089' //const localUrl = 'http://10.88.15.95:8089' const CompressionWebpackPlugin = require('compression-webpack-plugin') -- Gitblit v1.9.3