903af02d by xiaomiao

--no commit message

1 parent ec6ac939
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <el-col :span="16"> 45 <el-col :span="16">
46 <el-form-item label="审查人"> 46 <el-form-item label="审查人">
47 <el-input 47 <el-input
48 :disabled="!ableOperation || !item.shyj" 48 :disabled="!ableOperation"
49 v-model="item.shryxm" 49 v-model="item.shryxm"
50 ></el-input> 50 ></el-input>
51 </el-form-item> 51 </el-form-item>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <el-col :span="8"> 53 <el-col :span="8">
54 <el-form-item class="sjxzq" label="审核时间"> 54 <el-form-item class="sjxzq" label="审核时间">
55 <el-date-picker 55 <el-date-picker
56 :disabled="!ableOperation || !item.shyj" 56 :disabled="!ableOperation"
57 v-model="item.shkssj" 57 v-model="item.shkssj"
58 type="date" 58 type="date"
59 placeholder="选择日期" 59 placeholder="选择日期"
...@@ -109,9 +109,11 @@ export default { ...@@ -109,9 +109,11 @@ export default {
109 this.getShList(); 109 this.getShList();
110 }, 110 },
111 methods: { 111 methods: {
112 /** 112 /**
113 * @description: getShList 113 * @description: getShList
114 * @a 114 * @param {*} obj
115 * @author: renchao
116 */
115 getShList() { 117 getShList() {
116 this.$startLoading(); 118 this.$startLoading();
117 var formdata = { 119 var formdata = {
...@@ -123,8 +125,6 @@ export default { ...@@ -123,8 +125,6 @@ export default {
123 if (res.result.length) { 125 if (res.result.length) {
124 this.tableData = res.result; 126 this.tableData = res.result;
125 } 127 }
126
127 // this.ruleForm = res.result[res.result.length - 1]
128 } 128 }
129 }); 129 });
130 }, 130 },
...@@ -151,8 +151,12 @@ export default { ...@@ -151,8 +151,12 @@ export default {
151 this.$message.error("请完善核定意见信息填写"); 151 this.$message.error("请完善核定意见信息填写");
152 } else { 152 } else {
153 this.falg = true; 153 this.falg = true;
154 if (this.tableData[0].shyj != null && this.tableData[0].shyj != "") { 154 if (this.tableData[0].shyj != null && this.tableData[0].shyj != ""||
155 this.tableData[0].shryxm != null && this.tableData[0].shryxm != ""||
156 this.tableData[0].shkssj != null && this.tableData[0].shkssj != "") {
155 if ( 157 if (
158 this.tableData[0].shyj == null ||
159 this.tableData[0].shyj == ""||
156 this.tableData[0].shryxm == null || 160 this.tableData[0].shryxm == null ||
157 this.tableData[0].shryxm == "" || 161 this.tableData[0].shryxm == "" ||
158 this.tableData[0].shkssj == null || 162 this.tableData[0].shkssj == null ||
...@@ -166,8 +170,12 @@ export default { ...@@ -166,8 +170,12 @@ export default {
166 } else { 170 } else {
167 this.falg = true; 171 this.falg = true;
168 } 172 }
169 if (this.tableData[1].shyj != null && this.tableData[1].shyj != "") { 173 if (this.tableData[1].shyj != null && this.tableData[1].shyj != ""||
174 this.tableData[1].shryxm != null && this.tableData[1].shryxm != ""||
175 this.tableData[1].shkssj != null && this.tableData[1].shkssj != "") {
170 if ( 176 if (
177 this.tableData[1].shyj == null ||
178 this.tableData[1].shyj == ""||
171 this.tableData[1].shryxm == null || 179 this.tableData[1].shryxm == null ||
172 this.tableData[1].shryxm == "" || 180 this.tableData[1].shryxm == "" ||
173 this.tableData[1].shkssj == null || 181 this.tableData[1].shkssj == null ||
......