@@ -2845,6 +1709,7 @@ export default {
methods: {
ywTypeClick(tab){
this.queryParams = {
+ allInfo: null,
ywType: null,
muId: null,
taskId: null,
@@ -2928,6 +1793,7 @@ export default {
reset() {
this.form = {
id: null,
+ allInfo: null,
ywType: null,
muId: null,
muPath: null,
@@ -3316,9 +2182,48 @@ export default {
});
}else {
this.option1List.push({
+ allInfo: null,
relation: null,
name: null,
+ otherName: null,
+ usedName: null,
+ sex: null,
+ jhr1: null,
+ jhgx1: null,
+ jhr2: null,
+ jhgx2: null,
+ gmcszqfrq: null,
birthday: null,
+ address: null,
+ yj: null,
+ nation: null,
+ zjxy: null,
+ whcd: null,
+ hyzk: null,
+ zyjfwcs: null,
+ bxsqtzz: null,
+ gmzdhhmqfjgjrq: null,
+ hsyhdqlbxshsdjhk: null,
+ hsybxshcqlhsdjhk: null,
+ hshyqwhd: null,
+ zxhkrq: null,
+ zxhkyy: null,
+ hkdjsxbgjznrsjjblrz1: null,
+ hkdjsxbgjznrsjjblrz2: null,
+ jiguan: null,
+ xzz: null,
+ hzName: null,
+ hb: null,
+ djrq: null,
+ byzk: null,
+ height: null,
+ blood: null,
+ zy: null,
+ slReason: null,
+ sljmsfzqm: null,
+ qfyj: null,
+ yxrq: null,
+ cardId: null
})
}
},
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index 47cc044..db295fa 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -448,107 +448,107 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/dangan-ui/src/views/dangan/task/index.vue b/dangan-ui/src/views/dangan/task/index.vue
index 378011d..38fd4f3 100644
--- a/dangan-ui/src/views/dangan/task/index.vue
+++ b/dangan-ui/src/views/dangan/task/index.vue
@@ -129,13 +129,14 @@
成功：{{ form.successNum }}
查看成功图片
+
失败：{{ form.failNum }}
- 查看失败图片
+ 查看失败图片
@@ -319,7 +320,7 @@
-
+
添加行
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -658,6 +751,7 @@
open: false,
list: [],
total: 0,
+ sbType: null,
queryParams:{
pageNum: 1,
pageSize: 10,
@@ -692,10 +786,12 @@
this.xgtp.open = true;
this.xgtpQuery();
},
- getFailPicture(ids){
+ getFailPicture(ids,sbType){
+ console.log(sbType,2323);
this.xgtp.queryParams.pageNum = 1;
this.xgtp.queryParams.ids = ids;
this.xgtp.title="失败图片";
+ this.xgtp.sbType=sbType;
this.xgtp.open = true;
this.xgtpQuery();
},
@@ -1171,9 +1267,27 @@
console.log(this.option1List);
this.option1List.forEach( item =>{
const obj = {...this.shiBie.form};
+ obj.allInfo=item.allInfo;
obj.relation=item.relation;
obj.name=item.name;
+ obj.otherName=item.otherName;
+ obj.sex=item.sex;
obj.birthday=item.birthday;
+ obj.address=item.address;
+ obj.yj=item.yj;
+ obj.nation=item.nation;
+ obj.zjxy=item.zjxy;
+ obj.whcd=item.whcd;
+ obj.hyzk=item.hyzk;
+ obj.zyjfwcs=item.zyjfwcs;
+ obj.bxsqtzz=item.bxsqtzz;
+ obj.gmzdhhmqfjgjrq=item.gmzdhhmqfjgjrq;
+ obj.hsyhdqlbxshsdjhk=item.hsyhdqlbxshsdjhk;
+ obj.hsybxshcqlhsdjhk=item.hsybxshcqlhsdjhk;
+ obj.zxhkrq=item.zxhkrq;
+ obj.zxhkyy=item.zxhkyy;
+ obj.hkdjsxbgjznrsjjblrz1=item.hkdjsxbgjznrsjjblrz1;
+ obj.hkdjsxbgjznrsjjblrz2=item.hkdjsxbgjznrsjjblrz2;
arr.push(obj)
})
@@ -1258,17 +1372,110 @@
},
// 添加
addOption1(){
- if(this.option1List.length>3){
- this.$alert(`最多添加4条记录`, `提示`, {
- type: 'warning'
- });
- }else {
- this.option1List.push({
- relation: null,
- name: null,
- birthday: null,
- })
+ if(this.xgtp.sbType==='option1'){
+ if(this.option1List.length>3){
+ this.$alert(`最多添加4条记录`, `提示`, {
+ type: 'warning'
+ });
+ }else {
+ this.option1List.push({
+ allInfo: null,
+ relation: null,
+ name: null,
+ otherName: null,
+ usedName: null,
+ sex: null,
+ jhr1: null,
+ jhgx1: null,
+ jhr2: null,
+ jhgx2: null,
+ gmcszqfrq: null,
+ birthday: null,
+ address: null,
+ yj: null,
+ nation: null,
+ zjxy: null,
+ whcd: null,
+ hyzk: null,
+ zyjfwcs: null,
+ bxsqtzz: null,
+ gmzdhhmqfjgjrq: null,
+ hsyhdqlbxshsdjhk: null,
+ hsybxshcqlhsdjhk: null,
+ hshyqwhd: null,
+ zxhkrq: null,
+ zxhkyy: null,
+ hkdjsxbgjznrsjjblrz1: null,
+ hkdjsxbgjznrsjjblrz2: null,
+ jiguan: null,
+ xzz: null,
+ hzName: null,
+ hb: null,
+ djrq: null,
+ byzk: null,
+ height: null,
+ blood: null,
+ zy: null,
+ slReason: null,
+ sljmsfzqm: null,
+ qfyj: null,
+ yxrq: null,
+ cardId: null
+ })
+ }
+ }else if(this.xgtp.sbType==='option11'){
+ if(this.option1List.length>0){
+ this.$alert(`最多添加1条记录`, `提示`, {
+ type: 'warning'
+ });
+ }else {
+ this.option1List.push({
+ allInfo: null,
+ relation: null,
+ name: null,
+ otherName: null,
+ usedName: null,
+ sex: null,
+ jhr1: null,
+ jhgx1: null,
+ jhr2: null,
+ jhgx2: null,
+ gmcszqfrq: null,
+ birthday: null,
+ address: null,
+ yj: null,
+ nation: null,
+ zjxy: null,
+ whcd: null,
+ hyzk: null,
+ zyjfwcs: null,
+ bxsqtzz: null,
+ gmzdhhmqfjgjrq: null,
+ hsyhdqlbxshsdjhk: null,
+ hsybxshcqlhsdjhk: null,
+ hshyqwhd: null,
+ zxhkrq: null,
+ zxhkyy: null,
+ hkdjsxbgjznrsjjblrz1: null,
+ hkdjsxbgjznrsjjblrz2: null,
+ jiguan: null,
+ xzz: null,
+ hzName: null,
+ hb: null,
+ djrq: null,
+ byzk: null,
+ height: null,
+ blood: null,
+ zy: null,
+ slReason: null,
+ sljmsfzqm: null,
+ qfyj: null,
+ yxrq: null,
+ cardId: null
+ })
+ }
}
+
},
delOption1(index){
this.option1List.splice(index, 1)
@@ -1339,6 +1546,15 @@
}
}
+.cz1{
+ .el-form-item {
+ margin-bottom: 5px!important;
+ }
+ .el-form-item__label{
+ padding-right: 5px;
+ }
+}
+
.el-carousel__item{
background-color: #b5c2d2;
}
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 47cc044..db295fa 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -448,107 +448,107 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+