From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
vue.config.js | 6 +++---
src/views/plan/customerorder/index.vue | 1 +
src/views/plan/manufacturingorder/auto-operationtask.vue | 7 ++++---
src/router/router.js | 2 +-
src/views/technology/document/document-form.vue | 2 ++
src/views/plan/customerorder/customerorder-form.vue | 3 ---
src/views/technology/document/teststandard.vue | 10 +++++++++-
src/views/common/ztt-table.vue | 4 +++-
8 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/router/router.js b/src/router/router.js
index 35ea479..8ccaeca 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -8,7 +8,7 @@
//鍒涘缓璺敱
const createRouter = () => {
return new VueRouter({
- mode: 'history',
+ // mode: 'history',
scrollBehavior (to, from, savedPosition) {
if (savedPosition) {
return savedPosition
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index ab46d8f..3eaa9ef 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -181,6 +181,7 @@
<el-table-column
align="center"
type="selection"
+ :reserve-selection="options.reserveSelection"
v-if="options.multiSelect && !isEdit"
style="width: 55px;"
:selectable="selectHandle"
@@ -666,7 +667,8 @@
tableCellMerge: false,
cancelRunCreated: false, // 鏄惁鎵цcreated()鍐呭
isGenerateId: false,
- isGenerateField: 'id'
+ isGenerateField: 'id',
+ reserveSelection: false,
}
},
// table鑷�傚簲楂樺害搴曢儴楂樺害
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 47ad1d9..ce6d7f6 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -890,9 +890,6 @@
customerOrderNo: [
{ required: true, message: '瀹㈡埛璁㈠崟鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
- customerNo: [
- { required: true, message: '瀹㈡埛缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }
- ],
customerName: [
{ required: true, message: '瀹㈡埛鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
],
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 742d7f9..6636ad2 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -535,6 +535,7 @@
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'placeOrderDate', direction: 'desc' },
cancelRunCreated: true,
+ reserveSelection: true,//鏄惁淇濈暀涔嬪墠閫夋嫨鐨勬暟鎹�
},
table: {
total: 0,
diff --git a/src/views/plan/manufacturingorder/auto-operationtask.vue b/src/views/plan/manufacturingorder/auto-operationtask.vue
index ad4cf17..adbf859 100644
--- a/src/views/plan/manufacturingorder/auto-operationtask.vue
+++ b/src/views/plan/manufacturingorder/auto-operationtask.vue
@@ -282,8 +282,8 @@
if(ele.name.indexOf(opName)>-1){
workId = ele.id
}
- })
- return workId
+ })
+ return workId
},
getManufactureAttrs(type) {
remote(type).then((response) => {
@@ -551,11 +551,12 @@
const resData = response.data
if (resData.code === 0) {
const autoTaskList = resData.data
+ console.log("autoTaskList-----",autoTaskList);
autoTaskList.forEach((item) => {
this.operationData.push({
operationName: item.operationName,
workCenter: item.workCenter,
- workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations),
+ workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations||[]),
locationId: item.locationId,
partNo: item.partNo,
partName: item.partName,
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 29a5b03..e101abb 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -24,10 +24,12 @@
<el-row>
<el-col :span="6">
<el-form-item prop="name" label="鏂囦欢鍚嶇О">
+ <el-tooltip class="item" effect="dark" :content="dataForm.name" >
<el-input
v-model="dataForm.name"
placeholder="鏂囦欢鍚嶇О"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 8b3d2bc..61b085a 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -51,7 +51,7 @@
width="50"
/>
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
- <el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center" />
+ <el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center"/>
<el-table-column
label="瑕佹眰鍊�"
prop="referenceValue"
@@ -59,38 +59,46 @@
width="120px"
>
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.referenceValue" >
<el-input
v-model="scope.row.referenceValue"
placeholder="鍊�"
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center" width="120px">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.unit" >
<el-input
v-model="scope.row.unit"
placeholder="鍗曚綅"
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="娴嬭瘯鏂规硶" prop="method" align="center">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.method" >
<el-input
v-model="scope.row.method"
placeholder=""
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="娴嬭瘯鐩殑" prop="purpose" align="center">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.purpose" >
<el-input
v-model="scope.row.purpose"
placeholder=""
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right">
diff --git a/vue.config.js b/vue.config.js
index e27d858..4276ead 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,9 +5,9 @@
-const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
-// const url = 'http://192.168.32.45:9999'
+// const url = 'https://ztms-mes.chinaztt.cn/'
+ const url = 'http://localhost:9999'
+//const url = 'http://192.168.32.45:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3