diff --git a/src/api/ysjl.js b/src/api/ysjl.js
index 7c2cb95..45b9a59 100644
--- a/src/api/ysjl.js
+++ b/src/api/ysjl.js
@@ -80,10 +80,10 @@ export default {
},
exportExcel,
/**
- * 获取附表
+ * 查询原始记录检验项目【检验项目存储时的所有信息(不拼接字典列数据)】
* @param ysjlId
*/
- getYsjlFb: (ysjlId) => {
+ getJyxmInfoByYsjl: (ysjlId) => {
return api({
url: '/jyxm/getJyxmInfoByYsjl',
method: 'get',
diff --git a/src/components/Charts/MixBar.vue b/src/components/Charts/MixBar.vue
index 5e7b5ad..4f51b7c 100644
--- a/src/components/Charts/MixBar.vue
+++ b/src/components/Charts/MixBar.vue
@@ -4,7 +4,7 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ysjl/3000/dj/common/table.vue b/src/views/ysjl/3000/dj/common/table.vue
index 84d6c72..b1e366b 100644
--- a/src/views/ysjl/3000/dj/common/table.vue
+++ b/src/views/ysjl/3000/dj/common/table.vue
@@ -1,7 +1,7 @@
-
+
新增
@@ -10,7 +10,9 @@
@@ -24,7 +26,7 @@
:prop="item.prop"
:label="item.label"
>
-
+
{
- return []
- }
+ required: true
},
fromType: {
- type: String,
- default: ''
+ type: Number,
+ default: 0
},
tableData: {
type: Array,
- require: true,
- default: () => {
- return []
- }
+ required: true
}
},
data() {
@@ -114,7 +110,7 @@ export default {
console.log(item)
},
addtable() {
- this.$emit('addfn')
+ this.tableData.push({})
},
deleteFn() {
if (this.multipleSelection.length === 0) {
diff --git a/src/views/ysjl/3000/dj/common/table2.vue b/src/views/ysjl/3000/dj/common/zdftFb.vue
similarity index 50%
rename from src/views/ysjl/3000/dj/common/table2.vue
rename to src/views/ysjl/3000/dj/common/zdftFb.vue
index d3fc83d..136f77c 100644
--- a/src/views/ysjl/3000/dj/common/table2.vue
+++ b/src/views/ysjl/3000/dj/common/zdftFb.vue
@@ -1,82 +1,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ysjl/3000/dj/yeyin/index.vue b/src/views/ysjl/3000/dj/yeyin/index.vue
index 7f859a9..0ff00d7 100644
--- a/src/views/ysjl/3000/dj/yeyin/index.vue
+++ b/src/views/ysjl/3000/dj/yeyin/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '1',
+ type: 1,
arrayGroup: [
{
header: [
diff --git a/src/views/ysjl/3000/dj/yy/index.vue b/src/views/ysjl/3000/dj/yy/index.vue
index c9d1e46..cfa4296 100644
--- a/src/views/ysjl/3000/dj/yy/index.vue
+++ b/src/views/ysjl/3000/dj/yy/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '3',
+ type: 3,
arrayGroup: [
{
header: [
diff --git a/src/views/ysjl/3000/dj/zdft/index.vue b/src/views/ysjl/3000/dj/zdft/index.vue
index 75ed9db..5d8d2eb 100644
--- a/src/views/ysjl/3000/dj/zdft/index.vue
+++ b/src/views/ysjl/3000/dj/zdft/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '5',
+ type: 5,
arrayGroup: [
{
header: [
diff --git a/src/views/ysjl/3000/jj/wjf-yy/index.vue b/src/views/ysjl/3000/jj/wjf-yy/index.vue
index 6615388..40da390 100644
--- a/src/views/ysjl/3000/jj/wjf-yy/index.vue
+++ b/src/views/ysjl/3000/jj/wjf-yy/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '2',
+ type: 2,
arrayGroup: [
{
header: [
diff --git a/src/views/ysjl/3000/jj/yjf-yy/index.vue b/src/views/ysjl/3000/jj/yjf-yy/index.vue
index 41232cd..7aa113b 100644
--- a/src/views/ysjl/3000/jj/yjf-yy/index.vue
+++ b/src/views/ysjl/3000/jj/yjf-yy/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '2'
+ type: 2
}
},
computed: {
diff --git a/src/views/ysjl/3000/jj/yy-jj/index.vue b/src/views/ysjl/3000/jj/yy-jj/index.vue
index 6dc0a62..28d5adc 100644
--- a/src/views/ysjl/3000/jj/yy-jj/index.vue
+++ b/src/views/ysjl/3000/jj/yy-jj/index.vue
@@ -11,7 +11,7 @@ export default {
components: { baseInfo },
data() {
return {
- type: '4',
+ type: 4,
arrayGroup: [
{
header: [