style:证书入库

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.44:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'

@@ -30,7 +30,7 @@
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
     "connect": "3.6.6",
-    "element-ui": "^2.15.6",
+    "element-ui": "^2.15.8",
     "html-webpack-plugin": "3.2.0",
     "runjs": "4.3.2",
     "sass-loader": "8.0.2",

@@ -26,7 +26,8 @@ export function zsrk (data) {
     return request({
         url: '/sys/zsgl/zsrk',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 

@@ -218,7 +218,7 @@ aside {
 }
 
 .width100 {
-  width: 100%;
+  width: 100%!important;
 }
 
 .sub-navbar {

@@ -63,7 +63,7 @@
    </div>
 </template>
 <script>
-import zsylDialog from "./zsyl";
+import zsylDialog from "./zsyl.vue";
 import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js";
 
 export default {

 <template>
-  <dialogBox title="证书入库" @submitForm="submitForm"  saveButton="保存" width="45%"  @closeDialog="closeDialog" v-model="value">
-    <div>
-        <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="入库编号:" prop="batchno">
-                    <el-input v-model="ruleForm.batchno" :disabled="true"></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="登记机构:" prop="djjg">
-                    <el-select v-model="ruleForm.djjg" placeholder="请选择">
-                        <el-option v-for="item in dictData['ywly']" :key="item.dname" :label="item.dname" :value="item.dname"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="入库人员:" prop="rkry">
-                    <el-input v-model="ruleForm.rkry" :disabled="true"></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="入库时间:" prop="rksj">
-                    <el-date-picker v-model="ruleForm.rksj" type="datetime" placeholder="选择日期时间"></el-date-picker>
-                </el-form-item>
-            </el-col>
-          </el-row>
-            <div>
-              <el-table :data="tableForm" border style="width: 100%" :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}" :cell-style="{'text-align':'center'}">
-                  <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
-                  <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
-                       oninput="value=value.replace(/[^\d.]/g,'')" ></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
-                       oninput="value=value.replace(/[^\d.]/g,'')" ></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="bs" label="本数">
-                    <template slot-scope="scope">
-                      <span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
-                      <span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
-                      <span v-else>{{scope.row.bs}}</span>
-                    </template>
-                  </el-table-column>
-              </el-table>
-            </div>
-             <el-form-item label="备注" class="middle-margin-bottom">
-                <el-input type="textarea" v-model="ruleForm.bz" :rows="4"></el-input>
-             </el-form-item>
-        </el-form>
-    </div>
+  <dialogBox title="证书入库" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%"
+    @closeDialog="closeDialog" v-model="myValue">
+    <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="入库编号:" prop="batchno">
+            <el-input v-model="ruleForm.batchno" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="登记机构:" prop="djjg">
+            <el-select v-model="ruleForm.djjg" class="width100" placeholder="请选择">
+              <el-option v-for="item in dictData['ywly']" :key="item.dname" :label="item.dname" :value="item.dname">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="入库人员:">
+            <el-input v-model="ruleForm.rkry" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库时间:" prop="rksj">
+            <el-date-picker v-model="ruleForm.rksj" class="width100" type="datetime">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div>
+        <el-table :data="tableForm" border style="width: 100%"
+          :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}"
+          :cell-style="{'text-align':'center'}">
+          <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
+          <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
+                oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="bs" label="本数">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
+              <span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
+              <span v-else>{{scope.row.bs}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-form-item label="备注" class="middle-margin-bottom">
+        <el-input type="textarea" v-model="ruleForm.bz" :rows="4"></el-input>
+      </el-form-item>
+    </el-form>
   </dialogBox>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import { getSysSerialSingle,zsrk} from "@/api/zsgl.js"
+import { getSysSerialSingle, zsrk } from "@/api/zsgl.js"
 export default {
-  components: {
-  },
   computed: {
     ...mapGetters(['dictData']),
   },
@@ -74,20 +75,21 @@ export default {
   },
   data () {
     return {
+      myValue: this.value,
       //表单提交数据
       ruleForm: {
-          batchno: '',
-          djjg: '',
-          rkry: '超级管理员',
-          rksj: '',
-          bz: '',
-          zsstarno: '',
-          zsendno: '',
-          zsnum: '',
-          zmstarno: '',
-          zmendno: '',
-          zmnum: ''
-        },
+        batchno: '',
+        djjg: '',
+        rkry: '超级管理员',
+        rksj: '',
+        bz: '',
+        zsstarno: '',
+        zsendno: '',
+        zsnum: '',
+        zmstarno: '',
+        zmendno: '',
+        zmnum: ''
+      },
       //表格数据
       tableForm: [
         {
@@ -95,16 +97,16 @@ export default {
           ksysxlh: '',
           jsysxlh: '',
           bs: 0,
-          zslx:1
+          zslx: 1
         },
         {
           name: '不动产权登记证明',
           ksysxlh: '',
           jsysxlh: '',
           bs: 0,
-          zslx:2
+          zslx: 2
         }
-      ],  
+      ],
       //证书入库业务号参数
       ywhQueryForm: {
         serialtype: 'zsrkbh',
@@ -113,117 +115,122 @@ export default {
         digit: '5'
       },
       rules: {
-          batchNo: [
-            { required: true, message: '入库编号不能为空', trigger: 'blur' }
-          ],
-          djjg: [
-            { required: true, message: '请选择登记机构', trigger: 'change' }
-          ],
-          rkry: [
-            { required: true, message: '入库人员不能为空', trigger: 'blur' }
-          ],
-          rksj: [
-            { required: true, message: '请选择入库时间', trigger: 'change' }
-          ],
-        },
+        batchNo: [
+          { required: true, message: '入库编号不能为空', trigger: 'blur' }
+        ],
+        djjg: [
+          { required: true, message: '请选择登记机构', trigger: 'change' }
+        ],
+        rksj: [
+          { required: true, message: '请选择入库时间', trigger: 'change' }
+        ],
+      },
+    }
+  },
+  watch: {
+    value (val) {
+      this.myValue = val
     }
   },
   methods: {
     //表单提交
     submitForm () {
-      this.tableForm.forEach((item,index)=>{  
-          if(item.bs < 0){
-              return;
-          }
+      this.tableForm.forEach((item, index) => {
+        if (item.bs < 0) {
+          return;
+        }
       })
       zsrk(this.ruleForm).then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.$message.success('保存成功')
           this.$emit("input", false);
-          this.ruleForm = {};
+          this.$refs['ruleForm'].resetFields();
           this.resetTableFields();
           this.$parent.fetchData();
-        }else{
+        } else {
           this.$message.error(res.message);
         }
       })
     },
     //序列号获取
-    ywhSerial(){
+    ywhSerial () {
       getSysSerialSingle(this.ywhQueryForm).then(res => {
-        if(res.code == 200){
-            this.ruleForm.batchno = res.message;
+        if (res.code == 200) {
+          this.ruleForm.batchno = res.message;
         }
       })
     },
     //印刷序列号处理
-    ysxlhDeal(item){
-      if(item.ksysxlh && item.jsysxlh){
-        if(item.ksysxlh.length == item.jsysxlh.length){
-          if(item.ksysxlh.length != 11){
+    ysxlhDeal (item) {
+      if (item.ksysxlh && item.jsysxlh) {
+        if (item.ksysxlh.length == item.jsysxlh.length) {
+          if (item.ksysxlh.length != 11) {
             item.bs = -1;
             return;
           }
-          if(item.ksysxlh > item.jsysxlh){
+          if (item.ksysxlh > item.jsysxlh) {
             item.bs = -1;
             return;
           }
           item.bs = item.jsysxlh - item.ksysxlh + 1;
-          if(item.zslx == 1){
+          if (item.zslx == 1) {
             this.ruleForm.zsstarno = item.ksysxlh;
             this.ruleForm.zsendno = item.jsysxlh;
             this.ruleForm.zsnum = item.bs
-          }else if(item.zslx == 2){
+          } else if (item.zslx == 2) {
             this.ruleForm.zmstarno = item.ksysxlh;
             this.ruleForm.zmendno = item.jsysxlh;
             this.ruleForm.zmnum = item.bs
           }
-        }else{
+        } else {
           item.bs = -1;
         }
-      }else{
+      } else {
         item.bs = 0;
-        if(item.zslx == 1){
-            this.ruleForm.zsstarno = '';
-            this.ruleForm.zsendno = '';
-            this.ruleForm.zsnum = item.bs
-          }else if(item.zslx == 2){
-            this.ruleForm.zmstarno = '';
-            this.ruleForm.zmendno = '';
-            this.ruleForm.zmnum = item.bs
-          }
+        if (item.zslx == 1) {
+          this.ruleForm.zsstarno = '';
+          this.ruleForm.zsendno = '';
+          this.ruleForm.zsnum = item.bs
+        } else if (item.zslx == 2) {
+          this.ruleForm.zmstarno = '';
+          this.ruleForm.zmendno = '';
+          this.ruleForm.zmnum = item.bs
+        }
       }
     },
-    resetTableFields() {
+    resetTableFields () {
       this.tableForm = [
         {
           name: '不动产权证书',
           ksysxlh: '',
           jsysxlh: '',
           bs: 0,
-          zslx:1
+          zslx: 1
         },
         {
           name: '不动产权登记证明',
           ksysxlh: '',
           jsysxlh: '',
           bs: 0,
-          zslx:2
+          zslx: 2
         }
       ]
     },
     closeDialog () {
       this.$emit("input", false);
-    },
+      this.$refs['ruleForm'].resetFields();
+    }
   }
 }
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
-.font-red{
+
+.font-red {
   color: red
 }
-.middle-margin-bottom{
-  margin-top:20px
+
+.middle-margin-bottom {
+  margin-top: 20px
 }
 </style>

@@ -6,13 +6,13 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="入库编号">
-              <el-input v-model="approveForm.batchno" clearable  placeholder="入库编号"></el-input>
+              <el-input v-model="ruleForm.batchno" clearable placeholder="入库编号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="人库时间">
               <el-date-picker v-model="ruleForm.rksj" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable >
+                end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable>
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -32,17 +32,17 @@
         :data="tableData.data">
       </lb-table>
     </div>
-    <addDialog ref="addDialog" v-model="isDialog"/>
+    <addDialog ref="addDialog" v-model="isDialog" />
   </div>
 </template>
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./zsrkdata";
 import addDialog from "./components/addDialog.vue"
-import { getZsglrkList ,removeZsgl,verifyZsrk} from "@/api/zsgl.js"
+import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"
 export default {
   name: "zsrk",
-  components: {addDialog},
+  components: { addDialog },
   mixins: [table],
   mounted () {
     sendThis(this);
@@ -51,9 +51,7 @@ export default {
     return {
       isDialog: false,
       ruleForm: {
-        rksj: ''
-      },
-      approveForm: {
+        rksj: '',
         batchno: '',
         rkkssj: '',
         rkjssj: ''
@@ -66,12 +64,9 @@ export default {
     };
   },
   methods: {
-    init (e) {
-      this.fetchData()
-    },
     // 列表渲染接口
     fetchData () {
-      getZsglrkList({ ...this.approveForm, ...this.pageData }).then(res => {
+      getZsglrkList({ ...this.ruleForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
           let { total, records } = res.result
           this.tableData.total = total;
@@ -80,36 +75,36 @@ export default {
       })
     },
     openDialog () {
-      this.isDialog = true;
-      this.$nextTick(()=> {
+      this.$nextTick(() => {
         this.$refs.addDialog.ywhSerial();
+        this.isDialog = true;
       })
     },
     queryClick () {
       this.fetchData()
     },
     //修改筛选时间
-    timeChange() {
+    timeChange (val) {
       if (this.ruleForm.rksj != null) {
-        this.approveForm.rkkssj = this.ruleForm.rksj[0];
-        this.approveForm.rkjssj = this.ruleForm.rksj[1];
+        this.ruleForm.rkkssj = this.ruleForm.rksj[0];
+        this.ruleForm.rkjssj = this.ruleForm.rksj[1];
       } else {
-        this.approveForm.rkkssj = ''
-        this.approveForm.rkjssj = ''
+        this.ruleForm.rkkssj = ''
+        this.ruleForm.rkjssj = ''
       }
     },
     //删除证书入库数据
-    delZsrk(item){
+    delZsrk (item) {
       this.$confirm('确定要删除吗, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        removeZsgl({"bsmBatch":item.bsmBatch}).then(res => {
-          if(res.code == 200){
+        removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => {
+          if (res.code == 200) {
             this.$message.success("删除成功")
             this.fetchData();
-          }else{
+          } else {
             this.$message.error(res.message)
           }
         })
@@ -121,17 +116,17 @@ export default {
       });
     },
     //审核证书入库数据
-    confrimVerify(item){
+    confrimVerify (item) {
       this.$confirm('审核是否通过', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        verifyZsrk({"bsmBatch":item.bsmBatch}).then(res => {
-          if(res.code == 200){
+        verifyZsrk({ "bsmBatch": item.bsmBatch }).then(res => {
+          if (res.code == 200) {
             this.$message.success("审核成功")
             this.fetchData();
-          }else{
+          } else {
             this.$message.error(res.message)
           }
         })