Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b7c60ff6 by 田浩浩
Options

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

2 parents f30b75eb e536423d
Inline Side-by-side
Showing 3 changed files with 17 additions and 12 deletions
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
106 label: "扫描状态", 106 label: "扫描状态",
107 width: "80", 107 width: "80",
108 render: (h, scope) => { 108 render: (h, scope) => {
109 if (scope.row.children.length > 0) { 109 if (scope.row.children && scope.row.children.length > 0) {
110 return ( 110 return (
111 <div> 111 <div>
112 <span>已扫描</span> 112 <span>已扫描</span>
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 <el-col :span="8"> 82 <el-col :span="8">
83 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj"> 83 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
84 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期" 84 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
85 value-format="yyyy-MM-dd"></el-date-picker> 85 value-format="yyyy-MM-dd" :disabled="$route.query.viewtype || isJfOperation"></el-date-picker>
86 </el-form-item> 86 </el-form-item>
87 </el-col> 87 </el-col>
88 <el-col :span="8"> 88 <el-col :span="8">
......
...@@ -104,12 +104,12 @@ ...@@ -104,12 +104,12 @@
104 <el-row :gutter="10"> 104 <el-row :gutter="10">
105 <el-col :span="8"> 105 <el-col :span="8">
106 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg"> 106 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
107 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit"></el-input> 107 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 <el-col :span="8"> 110 <el-col :span="8">
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh"> 111 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
112 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit"></el-input> 112 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 <el-col :span="8"> 115 <el-col :span="8">
...@@ -121,19 +121,19 @@ ...@@ -121,19 +121,19 @@
121 <el-row :gutter="10"> 121 <el-row :gutter="10">
122 <el-col :span="8"> 122 <el-col :span="8">
123 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限：" prop="cfdj.cfqx"> 123 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限：" prop="cfdj.cfqx">
124 <el-input v-model="ruleForm.cfdj.cfqx" :disabled="$route.query.viewtype || ableEdit"></el-input> 124 <el-input v-model="ruleForm.cfdj.cfqx" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 <el-col :span="8"> 127 <el-col :span="8">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj"> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
129 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期" 129 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
130 value-format="yyyy-MM-dd"></el-date-picker> 130 value-format="yyyy-MM-dd" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-date-picker>
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 <el-col :span="8"> 133 <el-col :span="8">
134 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj"> 134 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
135 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" 135 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
136 :disabled="$route.query.viewtype || ableEdit" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> 136 :disabled="$route.query.viewtype || ableEdit || isJfOperation" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
137 </el-date-picker> 137 </el-date-picker>
138 </el-form-item> 138 </el-form-item>
139 </el-col> 139 </el-col>
...@@ -141,19 +141,19 @@ ...@@ -141,19 +141,19 @@
141 <el-row :gutter="10"> 141 <el-row :gutter="10">
142 <el-col :span="8"> 142 <el-col :span="8">
143 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="cfdj.cfwj"> 143 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="cfdj.cfwj">
144 <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit"></el-input> 144 <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 <el-col :span="16"> 147 <el-col :span="16">
148 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="cfdj.cffw"> 148 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="cfdj.cffw">
149 <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit"></el-input> 149 <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
150 </el-form-item> 150 </el-form-item>
151 </el-col> 151 </el-col>
152 </el-row> 152 </el-row>
153 <el-row :gutter="10"> 153 <el-row :gutter="10">
154 <el-col :span="24"> 154 <el-col :span="24">
155 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj"> 155 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
156 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit"> 156 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit || isJfOperation">
157 </el-input> 157 </el-input>
158 </el-form-item> 158 </el-form-item>
159 </el-col> 159 </el-col>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 <el-col> 162 <el-col>
163 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy"> 163 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
164 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" 164 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
165 :disabled="$route.query.viewtype || ableEdit"></el-input> 165 :disabled="$route.query.viewtype || ableEdit || isJfOperation"></el-input>
166 </el-form-item> 166 </el-form-item>
167 </el-col> 167 </el-col>
168 </el-row> 168 </el-row>
...@@ -213,12 +213,17 @@ export default { ...@@ -213,12 +213,17 @@ export default {
213 //页面数据 213 //页面数据
214 ruleForm: {}, 214 ruleForm: {},
215 //是否可编辑 215 //是否可编辑
216 ableEdit: false 216 ableEdit: false,
217 //是否为解封
218 isJfOperation: false,
217 }; 219 };
218 }, 220 },
219 async created () { 221 async created () {
220 this.propsParam = this.$attrs; 222 this.propsParam = this.$attrs;
221 this.ableEdit = this.$parent.showBatch; 223 this.ableEdit = this.$parent.showBatch;
224 if (this.propsParam.djlx == '400') {
225 this.isJfOperation = true;
226 }
222 var formdata = new FormData(); 227 var formdata = new FormData();
223 formdata.append("bsmSldy", this.propsParam.bsmSldy); 228 formdata.append("bsmSldy", this.propsParam.bsmSldy);
224 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 229 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
......