|
@@ -41,13 +41,13 @@
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="item in numberOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
+ :key="item.dictKey"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey"
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <span v-else>{{ scope.row.numberName }}</span>
|
|
|
+ <span v-else>{{ scope.row.ruleName }}</span>
|
|
|
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -55,12 +55,12 @@
|
|
|
<el-table-column label="数据填充">
|
|
|
<template slot-scope="scope">
|
|
|
<div v-if="scope.row.isEdit">
|
|
|
- <el-input v-model="scope.row.data" placeholder="输入生成编号时包含的固定字符" v-if="scope.row.number==='1'"></el-input>
|
|
|
- <el-input v-model="scope.row.data" placeholder="*自动获取当前合同段编号" v-if="scope.row.number==='2'" disabled></el-input>
|
|
|
- <el-input v-model="scope.row.data" placeholder="*自动获取各试验参数掩码" v-if="scope.row.number==='3'" disabled></el-input>
|
|
|
- <el-input v-model="scope.row.data" placeholder="*自动获取当前年份" v-if="scope.row.number==='4'" disabled></el-input>
|
|
|
- <el-input v-model="scope.row.data" placeholder="*自动获取当前月份" v-if="scope.row.number==='5'" disabled></el-input>
|
|
|
- <el-input v-model="scope.row.data" placeholder="输入子增长的起始值和位数" v-if="scope.row.number==='6'"></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="输入生成编号时包含的固定字符" v-if="scope.row.rule==='1'"></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="*自动获取当前合同段编号" v-if="scope.row.rule==='2'" disabled></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="*自动获取各试验参数掩码" v-if="scope.row.rule==='3'" disabled></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="*自动获取当前年份" v-if="scope.row.rule==='4'" disabled></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="*自动获取当前月份" v-if="scope.row.rule==='5'" disabled></el-input>
|
|
|
+ <el-input v-model="scope.row.data" placeholder="输入子增长的起始值和位数" v-if="scope.row.rule==='6'"></el-input>
|
|
|
</div>
|
|
|
<span v-else>{{ scope.row.data }}</span>
|
|
|
</template>
|
|
@@ -68,7 +68,7 @@
|
|
|
|
|
|
<el-table-column label="是否自增">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-checkbox v-model="scope.row.isAutoAdd" v-if="scope.row.number==='6'"></el-checkbox>
|
|
|
+ <el-checkbox v-model="scope.row.isAutoIncrement" v-if="scope.row.rule==='6'" :true-label="1" :false-label="0"></el-checkbox>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" width="150">
|
|
@@ -83,6 +83,7 @@
|
|
|
<el-button
|
|
|
type="text"
|
|
|
@click="handleSave(scope.$index, scope.row)"
|
|
|
+ :loading="scope.row.loading"
|
|
|
v-else
|
|
|
>
|
|
|
保存
|
|
@@ -102,15 +103,12 @@
|
|
|
</el-tabs>
|
|
|
|
|
|
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="handleSubmit">保 存</el-button>
|
|
|
- </span>
|
|
|
+
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {getTrialNumberRule } from "@/api/ruleManage/codeRule.js";
|
|
|
+import {getTrialNumberRule,save } from "@/api/ruleManage/codeRule.js";
|
|
|
import { getDictionary } from "@/api/system/dict";
|
|
|
export default {
|
|
|
name: 'FileRuleDialog',
|
|
@@ -125,21 +123,12 @@ export default {
|
|
|
tableLoading: false,
|
|
|
|
|
|
numberOptions: [
|
|
|
- { value: '1', label: '固定字符' },
|
|
|
- { value: '2', label: '合同段编号' },
|
|
|
- { value: '3', label: '参数掩码' },
|
|
|
- { value: '4', label: '年份' },
|
|
|
- { value: '5', label: '月份' },
|
|
|
- { value: '6', label: '流水号' },
|
|
|
+
|
|
|
],
|
|
|
dataNumber: 'BG-20243W-00001',
|
|
|
activeName:'1',
|
|
|
activeOptions: [
|
|
|
- { value: '1', label: '材料编号' },
|
|
|
- { value: '2', label: '样品编号' },
|
|
|
- { value: '3', label: '委托单编号' },
|
|
|
- { value: '4', label: '记录表编号' },
|
|
|
- { value: '5', label: '报告表编号' }
|
|
|
+
|
|
|
]
|
|
|
|
|
|
}
|
|
@@ -185,7 +174,7 @@ export default {
|
|
|
this.tableLoading = false;
|
|
|
if (res.data.code == 200) {
|
|
|
|
|
|
- this.tableData = res.data.data['records'];
|
|
|
+ this.tableData = res.data.data['list'];
|
|
|
this.total = res.data.data['total'];
|
|
|
}else{
|
|
|
this.tableData = [];
|
|
@@ -207,7 +196,10 @@ export default {
|
|
|
},
|
|
|
|
|
|
handleSave(index, row) {
|
|
|
-
|
|
|
+ console.log(row,'row');
|
|
|
+ row.loading=true
|
|
|
+
|
|
|
+
|
|
|
row.isEdit = false
|
|
|
},
|
|
|
|
|
@@ -225,8 +217,8 @@ export default {
|
|
|
console.log(data,'data');
|
|
|
console.log(row,'row');
|
|
|
this.numberOptions.forEach(item => {
|
|
|
- if (item.value === data) {
|
|
|
- row.numberName = item.label
|
|
|
+ if (item.dictKey === data) {
|
|
|
+ row.ruleName = item.dictValue
|
|
|
}
|
|
|
})
|
|
|
// 处理节点选择变化
|