Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

public/JsonData/CODE_XSJSBD_RWZTDM.json

+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"1047655",
+				"label":"入库",
+				"codeType":"CODE_XSJSBD_RWZTDM",
+				"text":"入库",
+				"pId":null,
+				"id":"01",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"1047656",
+				"label":"审批通过",
+				"codeType":"CODE_XSJSBD_RWZTDM",
+				"text":"审批通过",
+				"pId":null,
+				"id":"02",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"1047657",
+				"label":"审批不通过",
+				"codeType":"CODE_XSJSBD_RWZTDM",
+				"text":"审批不通过",
+				"pId":null,
+				"id":"03",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"1047658",
+				"label":"已签收",
+				"codeType":"CODE_XSJSBD_RWZTDM",
+				"text":"已签收",
+				"pId":null,
+				"id":"04",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"1047659",
+				"label":"已反馈",
+				"codeType":"CODE_XSJSBD_RWZTDM",
+				"text":"已反馈",
+				"pId":null,
+				"id":"05",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file

src/components/ptCxForm_components.vue

@@ -407,7 +407,9 @@
                 pageBs != 'hmxsGl' &&
                 pageBs != 'ryxsGl' &&
                 pageBs != 'caseGl' &&
-                pageBs != 'rwbd'
+                pageBs != 'rwbd' && 
+                pageBs != 'rySp' &&
+                pageBs != 'addZdry'
               "
             >
               <!-- 暂时修改成这样 -->
@@ -419,10 +421,9 @@
             </div>
             <div
               v-else-if="
-                (pageBs != 'rwbd' &&
-                  (columnTitle.prop == 'xxzjbh' ||
-                    columnTitle.prop == 'asjbh')) ||
+                (pageBs != 'rwbd' && (columnTitle.prop == 'xxzjbh' || columnTitle.prop == 'asjbh' || columnTitle.prop == 'xm' )) ||
                 (pageBs == 'rwbd' && columnTitle.prop == 'rwmc')
+                
               "
             >
               <!-- 暂时修改成这样 -->

src/views/kyxs/hmxs/addHmxs.vue

@@ -105,11 +105,6 @@ export default {
           isActive: false,
         },
         {
-          name: "号码线索管理",
-          to: "/hmxsGl",
-          isActive: false,
-        },
-        {
           name: "新增号码线索",
           to: "/addHmxs",
           isActive: true,

src/views/kyxs/jdcxs/addJdcxs.vue

@@ -103,11 +103,6 @@ export default {
           isActive: false,
         },
         {
-          name: "机动车索管理",
-          to: "/jdcxsGl",
-          isActive: false,
-        },
-        {
           name: "新增机动车线索",
           to: "/addJdcxs",
           isActive: true,

src/views/kyxs/ryxs/addRyxs.vue

@@ -107,11 +107,6 @@ export default {
           isActive: false,
         },
         {
-          name: "人员线索管理",
-          to: "/ryxsGl",
-          isActive: false,
-        },
-        {
           name: "新增人员线索",
           to: "/addRyxs",
           isActive: true,

src/views/kyxs/yhkxs/addYhkxs.vue

@@ -105,11 +105,6 @@ export default {
           isActive: false,
         },
         {
-          name: "银行卡线索管理",
-          to: "/yhkxsGl",
-          isActive: false,
-        },
-        {
           name: "新增银行卡线索信息",
           to: "/addYhkxs",
           isActive: true,

src/views/zdry/addInsertZdry.vue

@@ -11,6 +11,7 @@
 
 <script>
 import formCompontent from "@c/form.vue";
+import { getRybq } from "@/api/zdry/zdryGl.js";
 import axios from "@/utils/http.js";
 import { insertZdry, updateAddZdry, infoAddZdry } from "@/api/zdry/zdrysp.js";
 export default {
@@ -56,7 +57,7 @@ export default {
               col: "2",
             },
             {
-              name: "名族:",
+              name: "民族:",
               id: "mzdm",
               type: "codeTree",
               codeTree: "CODE_MZ",
@@ -89,8 +90,9 @@ export default {
             {
               name: "人员标签:",
               id: "code",
-              type: "text",
+              type: "setValue",
               value: "",
+              codeOptions: [],
               placeholder: "请输入",
               col: "2",
             },
@@ -150,6 +152,18 @@ export default {
     };
   },
   methods: {
+    getCode() {
+      let arr = [];
+      getRybq().then((res) => {
+        res.data.rows.forEach((item) => {
+          arr.push({
+            label: item.name,
+            value: item.code,
+          });
+        });
+        this.$set(this.propFormField[0].data[6], "codeOptions", arr);
+      });
+    },
     submit(params) {
       console.log(params);
       let loading = this.$loading({
@@ -259,6 +273,7 @@ export default {
       this.id = this.$route.query.id;
       this.getshuju();
     }
+    this.getCode();
   },
 };
 </script>

src/views/zdry/addZdry.vue

@@ -107,14 +107,14 @@ export default {
           codeOptions: [],
           codeTree: "CODE_AJLB",
         },
-        {
-          name: "自定义标签",
-          id: "zdyCodeTxt",
-          type: "select",
-          value: "",
-          col: "3",
-          selectData: [],
-        },
+        // {
+        //   name: "自定义标签",
+        //   id: "zdyCodeTxt",
+        //   type: "select",
+        //   value: "",
+        //   col: "3",
+        //   selectData: [],
+        // },
         {
           name: "人员标签",
           id: "zdyCode",
@@ -164,14 +164,14 @@ export default {
           placeholder: "请选择",
           col: "3",
         },
-        {
-          name: "审批人警号",
-          id: "sprjh",
-          type: "text",
-          value: "",
-          placeholder: "请填写",
-          col: "3",
-        },
+        // {
+        //   name: "审批人警号",
+        //   id: "sprjh",
+        //   type: "text",
+        //   value: "",
+        //   placeholder: "请填写",
+        //   col: "3",
+        // },
       ],
       cxDefaultFormThead: [
         {
@@ -180,7 +180,7 @@ export default {
         },
         {
           label: "身份证号",
-          prop: "Zjhm",
+          prop: "zjhm",
         },
         {
           label: "性别",
@@ -242,7 +242,7 @@ export default {
           });
         });
       });
-      this.$set(this.cxQueryField[9], "selectData", arr);
+      this.$set(this.cxQueryField[6], "selectData", arr);
     },
     add() {
       this.$router.push("/addInsertZdry");

src/views/zdry/rySp.vue

@@ -64,6 +64,8 @@ export default {
       cxFormData: {
         limit: 10,
         page: 1,
+        splc: "1",
+        sprjh: "",
       },
       cxQueryField: [
         // {
@@ -221,7 +223,7 @@ export default {
         },
         {
           label: "身份证号",
-          prop: "Zjhm",
+          prop: "zjhm",
         },
         {
           label: "性别",
@@ -275,6 +277,10 @@ export default {
     this.$store.commit("user/SET_Menu", this.Menu);
     this.getCode();
     this.cxQueryField[10].value = '1';
+    let userInfo = window.sessionStorage.getItem("userInfo") || "";
+    var obj = JSON.parse(userInfo)
+    this.sprjh = obj.account
+    console.log(this.sprjh);
     // debugger;
   },
   methods: {

src/views/zdxx/zdxxgl/queryZdxxgl.vue

@@ -116,7 +116,7 @@ export default {
         },
         {
           label: "阵地纬度",
-          prop: "Zdwd",
+          prop: "zdwd",
         },
         {
           label: "证件号码",
@@ -124,7 +124,7 @@ export default {
         },
         {
           label: "姓名",
-          prop: "Xm",
+          prop: "xm",
         },
         {
           label: "涉及省份和地区",