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

@@ -106,7 +106,7 @@ export default {
           label: "扫描状态",
           width: "80",
           render: (h, scope) => {
-            if (scope.row.children.length > 0) {
+            if (scope.row.children && scope.row.children.length > 0) {
               return (
                 <div>
                   <span>已扫描</span>

@@ -82,7 +82,7 @@
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
               <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
-                value-format="yyyy-MM-dd"></el-date-picker>
+                value-format="yyyy-MM-dd" :disabled="$route.query.viewtype || isJfOperation"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -104,12 +104,12 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
-              <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
-              <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -121,19 +121,19 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限：" prop="cfdj.cfqx">
-              <el-input v-model="ruleForm.cfdj.cfqx" :disabled="$route.query.viewtype || ableEdit"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfqx" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
               <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
-                value-format="yyyy-MM-dd"></el-date-picker>
+                value-format="yyyy-MM-dd" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
               <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
-                :disabled="$route.query.viewtype || ableEdit" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
+                :disabled="$route.query.viewtype || ableEdit || isJfOperation" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -141,19 +141,19 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="cfdj.cfwj">
-              <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="16">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="cfdj.cffw">
-              <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit"></el-input>
+              <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
-              <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit">
+              <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit || isJfOperation">
               </el-input>
             </el-form-item>
           </el-col>
@@ -162,7 +162,7 @@
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
               <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
-                :disabled="$route.query.viewtype || ableEdit"></el-input>
+                :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -213,12 +213,17 @@ export default {
       //页面数据
       ruleForm: {},
       //是否可编辑
-      ableEdit: false
+      ableEdit: false,
+      //是否为解封
+      isJfOperation: false,
     };
   },
   async created () {
     this.propsParam = this.$attrs;
     this.ableEdit = this.$parent.showBatch;
+    if (this.propsParam.djlx == '400') {
+      this.isJfOperation = true;
+    }
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSlsq", this.$route.query.bsmSlsq);