Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/components/form.vue

@@ -921,7 +921,7 @@
                                     >支持png,jpg,doc,pdf格式,大小不超过3MB</span
                                   >
                                   <span
-                                    v-else-if="item4.id == 'asjfjDzwjnr'"
+                                    v-else-if="item4.id == 'asjfjDzwjnr' || item4.id == 'spflwsfj'"
                                     style="
                                       color: red;
                                       margin-left: 20px;
@@ -1566,6 +1566,9 @@ export default {
           }
           // debugger
           console.log(this.pageBs);
+          console.log(self.formLabelAlign);
+         
+          
           if (
             self.pageBs &&
             ((self.pageBs == "adjustRlqbxs" &&
@@ -1578,7 +1581,7 @@ export default {
           } else if(self.pageBs && self.pageBs == 'adjustZdxxgl' && self.formLabelAlign.zdryxxgl[0].xm == "") {
             this.$message.error("请填写阵地管理人员");
             return;
-          } else if(self.pageBs && self.pageBs == 'addzdcyryxx' && self.formLabelAlign.ryjl[0].dwmc == "") {
+          } else if(self.pageBs && self.pageBs == 'addzdcyryxx' && self.formLabelAlign.ryjl.length == 0) {
             this.$message.error("请填写从业人员及人员经历");
           } else if(self.pageBs && self.pageBs == 'addzdjyhd' && (self.formLabelAlign.xgry[0].xm == "" || self.formLabelAlign.zpxx[0].wjmc == "" || self.formLabelAlign.spxx[0].wjmc == "")) {
             this.$message.error("请填写交易活动相关人员以及图片视频信息");

src/utils/params.js

@@ -219,7 +219,7 @@ const zdglryxx = [
   {
     name: "证件号码:",
     id: "zjhm",
-    type: "text",
+    type: "textTqs",
     disabled: false,
     prop: "checkEmpty",
     value: "",

src/views/zdxx/zdcyryxx/addZdcyryxx.vue

@@ -107,7 +107,7 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "",
+          title: "人员信息",
           id: 1,
           objStr: "zdry",
           index: 0,
@@ -422,6 +422,10 @@ export default {
       messageGet: {
         cxDefaultFormThead: [
           {
+            label: "阵地名称",
+            prop: "zdmc",
+          },
+          {
             label: "阵地规模",
             prop: "zdgm",
           },
@@ -430,10 +434,6 @@ export default {
             prop: "fxcd",
           },
           {
-            label: "阵地名称",
-            prop: "zdmc",
-          },
-          {
             label: "阵地联系电话",
             prop: "zdlxdh",
           },
@@ -480,7 +480,7 @@ export default {
       });
     },
     editSubmit(params, loading) {
-      params.append("xxzjbh", this.xxzjbh);
+      params.append("zdry.xxzjbh", this.xxzjbh);
       updateZdcyryxx(params).then((res) => {
         if (res.success && res.code == 200) {
           this.$alert("修改成功!", "提示", {
@@ -515,6 +515,7 @@ export default {
       return "";
     },
     ajtq(item) {
+      console.log(this.formLabelAlign);
       debugger;
       let self = this;
       var params = new FormData();
@@ -548,7 +549,7 @@ export default {
                   self.$set(
                     self.formLabelAlign,
                     j.id,
-                    i.objStr ? result[i.objStr][j.id] : result[j.id]
+                    result[j.id]
                   );
                 }
               });

src/views/zdxx/zdjyhd/addZdjyhd.vue

@@ -829,7 +829,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -862,7 +862,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -899,7 +899,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -940,7 +940,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -981,7 +981,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1022,7 +1022,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1059,7 +1059,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1096,7 +1096,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1137,7 +1137,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -2042,18 +2042,18 @@ export default {
   created() {
     this.$store.commit("user/SET_Breadcrumb", this.Menu);
     console.log(this.$route.query);
-    if (this.$route.query.glzdxxzjbh) {
-      this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
-      this.ssdy.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssfjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.sskl.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssqtwp.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssqz.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssww.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.ssydtxsb.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      this.sszj.cxFormData.glzdxxzjbh = this.glzdxxzjbh
-      console.log(this.glzdxxzjbh);
+    if (this.$route.query.xxzjbh) {
+      this.xxzjbh = this.$route.query.xxzjbh;
+      this.ssdy.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssfjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.sskl.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssqtwp.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssqz.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssww.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssydtxsb.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.sszj.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      console.log(this.xxzjbh);
     }
     if (this.$route.query.xxzjbh) {
       // this.$set(this.propFormField[0], "title", "修改阵地交易活动信息");

src/views/zdxx/zdjyhd/detailZdjyhd.vue

@@ -524,7 +524,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -557,7 +557,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -594,7 +594,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -635,7 +635,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -676,7 +676,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -717,7 +717,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -754,7 +754,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -791,7 +791,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -832,7 +832,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.glzdxxzjbh,
+          gljyhdxxzjbh: this.xxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1592,6 +1592,19 @@ export default {
     },
   },
   created() {
+    if (this.$route.query.xxzjbh) {
+      this.xxzjbh = this.$route.query.xxzjbh;
+      this.ssdy.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssfjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.sskl.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssqtwp.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssqz.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssww.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.ssydtxsb.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      this.sszj.cxFormData.gljyhdxxzjbh = this.xxzjbh
+      console.log(this.xxzjbh);
+    }
     this.xxzjbh = this.$route.query.xxzjbh;
     this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
     this.getInfor();

src/views/zdxx/zdxsxx/zdxsxxDetail.vue

@@ -62,8 +62,8 @@ export default {
             },
             {
               label: "线索类型:",
-              prop: "zdxsrlqbxs",
-              col: "10",
+              prop: "zdxsrlqbxsStr",
+              col: "3",
             },
           ],
         },

src/views/zdxx/zdxxgl/queryZdxxgl.vue

@@ -130,7 +130,15 @@ export default {
           type: "text",
           value: "",
           placeholder: "请输入",
-          col: "2",
+          col: "3",
+        },
+        {
+          name: "阵地编号:",
+          id: "xxzjbh",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "3",
         },
         {
           name: "阵地管理人员姓名",
@@ -167,6 +175,11 @@ export default {
           width: "200",
         },
         {
+          label: "阵地编号",
+          prop: "xxzjbh",
+          width: "260",
+        },
+        {
           label: "登记时间",
           prop: "djsj",
         },
@@ -302,14 +315,14 @@ export default {
             //   className: "iconfont iconrizhi",
             //   disabled: false,
             // },
-            {
-              id: "queryZdxxss",
-              label: "阵地线索信息管理",
-              index: "queryZdxxss",
-              auth: "M0101",
-              className: "iconfont iconrizhi",
-              disabled: false,
-            },
+            // {
+            //   id: "queryZdxxss",
+            //   label: "阵地线索信息管理",
+            //   index: "queryZdxxss",
+            //   auth: "M0101",
+            //   className: "iconfont iconrizhi",
+            //   disabled: false,
+            // },
             {
               id: "queryqzdjs",
               label: "全阵地信息检索",