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

src/views/AllPersonnelBase/modules/xzry.vue

@@ -40,10 +40,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="警综人员编号："
-            prop="jzrybh"
-          >
+          <el-form-item label="警综人员编号：">
+            <!-- prop="jzrybh" -->
             <el-input
               v-model.trim="ruleForm.jzrybh"
               placeholder="请输入警综人员编号"
@@ -58,23 +56,23 @@
       <el-row>
         <el-col :span="12">
           <el-form-item
-            label="案事件相关人员编号："
-            prop="asjxgrybh"
+            label="采集信息原因："
+            prop="cjxxyydm"
           >
-            <el-input
-              v-model.trim="ruleForm.asjxgrybh"
-              placeholder="请输入案事件相关人员编号"
-              maxlength="23"
-              show-word-limit
+            <SelectCode
+              codeUrl="/api/code/cjxxyydm"
+              width="16.5"
               clearable
-            ></el-input>
+              :form="ruleForm"
+              id="cjxxyydm"
+              multiple
+              :multipleLimit="5"
+            ></SelectCode>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="指掌纹卡编号："
-            prop="zzhwkbh"
-          >
+          <el-form-item label="指掌纹卡编号：">
+            <!-- prop="zzhwkbh" -->
             <el-input
               v-model.trim="ruleForm.zzhwkbh"
               placeholder="请输入指掌纹卡编号"
@@ -88,22 +86,22 @@
       <!-- 四 -->
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="采集信息原因："
-            prop="cjxxyydm"
-          >
-            <SelectCode
-              codeUrl="/api/code/cjxxyydm"
-              width="16.5"
+          <el-form-item>
+
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="案事件相关人员编号：">
+            <!-- prop="asjxgrybh" -->
+            <el-input
+              v-model.trim="ruleForm.asjxgrybh"
+              placeholder="请输入案事件相关人员编号"
+              maxlength="23"
+              show-word-limit
               clearable
-              :form="ruleForm"
-              id="cjxxyydm"
-              multiple
-              :multipleLimit="5"
-            ></SelectCode>
+            ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12"> </el-col>
       </el-row>
       <el-divider></el-divider>
       <!-- 五 -->
@@ -443,7 +441,7 @@ export default {
     return {
       dialogVisible: false, // 弹窗状态
       labelPosition: "left", // 数据项对齐方式
-      checkedTargets: [], // 选定的目标逻辑库
+      checkedTargets: ['1'], // 选定的目标逻辑库
       targets: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库
       logicDatabaseCode: [],// 逻辑库代码
       ruleForm: {

src/views/bzxxgl/bzxxsh.vue

@@ -348,16 +348,16 @@ export default {
       TAG: '比中信息审核-',
       ruleForm: initRuleFrom,
 
-      YTMH: {width: '220', prop: 'ytmh', label: '源条码号', isShow: true},
-      MBTMH: {width: '220', prop: 'mbtmh', label: '目标条码号', isShow: true},
-      YZW: {width: '125', prop: 'yzw', label: '源指位/序号', isShow: true},
-      MBZW: {width: '125', prop: 'mbzw', label: '目标指位/序号', isShow: true},
-      SBDW: {width: '160', prop: 'sbdwGajgjgdmStr', label: '上报单位', isShow: true},
-      SBSJ: {width: '160', prop: 'sbsj', label: '上报时间', isShow: true},
-      SHR: {width: '120', prop: 'shrXm', label: '审核人', isShow: true},
-      SHSJ: {width: '120', prop: 'shsj', label: '审核时间', isShow: true},
-      ZGZT: {width: '120', prop: 'sfjrzg', label: '战果状态', isShow: true},
-      SHZT: {width: '120', prop: 'shzt', label: '审核状态', isShow: true},
+      YTMH: {width: '210', prop: 'ytmh', label: '源条码号', isShow: true},
+      MBTMH: {width: '207', prop: 'mbtmh', label: '目标条码号', isShow: true},
+      YZW: {width: '108', prop: 'yzw', label: '源指位/序号', isShow: true},
+      MBZW: {width: '112', prop: 'mbzw', label: '目标指位/序号', isShow: true},
+      SBDW: {width: '172', prop: 'sbdwGajgjgdmStr', label: '上报单位', isShow: true},
+      SBSJ: {width: '166', prop: 'sbsj', label: '上报时间', isShow: true},
+      SHR: {width: '96', prop: 'shrXm', label: '审核人', isShow: true},
+      SHSJ: {width: '115', prop: 'shsj', label: '审核时间', isShow: true},
+      ZGZT: {width: '114', prop: 'sfjrzg', label: '战果状态', isShow: true},
+      SHZT: {width: '130', prop: 'shzt', label: '审核状态', isShow: true},
 
       queryTypeBtns: [
         {value: 2, name: '正查'},