From ddaa8803892b23b99579b5971449826c06b409cb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 三月 2024 13:24:09 +0800
Subject: [PATCH] bug
---
src/views/plan/productionschedul/index.vue | 2 +-
src/views/quality/rawMaterial/rawMaterial-form.vue | 3 +++
src/views/quality/teststandard/index.vue | 4 ++--
src/views/technology/operation/operation-form.vue | 2 ++
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 20ddc6d..ea426fd 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -190,7 +190,7 @@
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'time', direction: 'desc' },
+ defaultOrderBy: { column: 'id', direction: 'asc' },
cancelRunCreated: false,
tableCellMerge: true
},
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index f57a0cb..7be1a3d 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -97,6 +97,8 @@
:disabled="dataForm.id!=null"
v-model="dataForm.createTime"
type="datetime"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鎶ユ鏃ユ湡">
</el-date-picker>
</el-form-item>
@@ -186,6 +188,7 @@
ref="testValueInput"
@blur="checkTestValues(scope.row,'blur',$event)"
@select="checkTestValues(scope.row,'select',$event)"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
v-model="scope.row.testValueList[index]"
:fetch-suggestions="querySearch"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" >
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 1398ad8..c649472 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -160,7 +160,7 @@
></el-input>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鍙傛暟椤圭被鍨�"
prop="paramType"
align="center"
@@ -180,7 +180,7 @@
</el-option>
</el-select>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鍙傛暟鏍煎紡"
prop="parameterFormat"
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 4b83510..dfdf857 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -281,6 +281,7 @@
<ParamTemplateDialog
:currshowlist.sync="showOperationTemplate"
@handleSelectionParamTemplateChange="selectOperationTemplate"
+ :paramTemplateObj="templateDefaultObj"
/>
<StepDialog
:currshowlist.sync="showStep"
@@ -329,6 +330,7 @@
typeOptions: [],
ids: [],
showOperationTemplate: false,
+ templateDefaultObj: { dataType: '鐢熶骇璁板綍' },
showStep: false,
isInsertStep: false,
stepIndex: null,
--
Gitblit v1.9.3