Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -14,13 +14,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="开始日期" prop="startTime">
+            <el-form-item label="接收开始日期" prop="startTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
                 clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结束日期" prop="endTime">
+            <el-form-item label="接收结束日期" prop="endTime">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
                 clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
@@ -33,14 +33,27 @@
         </el-row>
         <el-row class="mt-10">
            <el-col :span="6">
-            <el-form-item label="业务名称" prop="ywmc">
-              <el-select v-model="form.ywmc" class="width100" clearable placeholder="业务名称">
-                <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
+            <el-form-item label="业务号" prop="ywh">
+              <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="权利类型" prop="qllx">
+              <el-select v-model="form.ywmc" class="width100" clearable placeholder="权利类型">
+                <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="3">
+            <el-form-item label="登记类型" prop="djlx">
+              <el-select v-model="form.ywmc" class="width100" clearable placeholder="登记类型">
+                <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
             <el-form-item label="检查结果" prop="jcjg">
               <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果">
                 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
@@ -48,7 +61,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="3">
             <el-form-item label="入库结果" prop="rkjg">
               <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果">
                 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
@@ -87,7 +100,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js";
 export default {
   name: "jsbwcx",
   mixins: [tableMixin],
-  data () {
+  data() {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -177,30 +190,11 @@ export default {
       },
       // 业务名称
       statusOptions: [],
-      // 行政区
-      xzqOptions: [
-        {
-          value: "632321",
-          label: "同仁县",
-        },
-        {
-          value: "632322",
-          label: "尖扎县",
-        },
-        {
-          value: "632323",
-          label: "泽库县",
-        },
-        {
-          value: "632324",
-          label: "河南县",
-        },
-      ],
     };
   },
   methods: {
     // 初始化数据
-    queryClick () {
+    queryClick() {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -210,14 +204,14 @@ export default {
       });
     },
     // 重置
-    resetForm () {
+    resetForm() {
       this.$refs.ruleForm.resetFields();
     },
-    featchData () {
+    featchData() {
       this.queryClick();
     },
     // 详情
-    handleEdit () {
+    handleEdit() {
       this.$popupDialog(
         "业务报文",
         "components/JsonEditor/index",

@@ -8,7 +8,7 @@
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>