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

@@ -114,6 +114,14 @@ export function saveSpyj (data) {
         data
     })
 }
+// 根据受理申请保存审批意见
+export function saveSpyjBySlsq (data) {
+    return request({
+        url: '/business/workFlow/saveSpyjBySlsq',
+        method: 'post',
+        data
+    })
+}
 // 登簿接口
 export function record (data) {
     return request({

@@ -6,52 +6,19 @@
   <div class='spyj'>
     <b class="spyj_title">审批表</b>
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
-      <div class="spyj_form">
+      <div class="spyj_form" v-for="(item,index) in tableData" :key="index">
         <div class="item_left">
-          初审意见
+          {{item.jdmc}}意见
         </div>
         <div class="item_right">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label-width="0" class="opinion_item" prop="shyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj">
-                </el-input>
-                <el-popover placement="right" width="50" trigger="hover">
-                  <ul class="pointer">
-                    <li @click="handleClick">复审</li>
-                    <li>初审意见</li>
-                  </ul>
-                  <el-button class="opinion_btn" slot="reference">常用意见</el-button>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="审查人：" prop="scr">
-                {{ ruleForm.shryxm }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审核时间：" prop="shjssj">
-                {{ ruleForm.shjssj }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="spyj_form">
-        <div class="item_left">
-          复审意见
-        </div>
-        <div class="item_right">
-          <el-row>
+          <el-row >
             <el-col :span="24">
               <el-form-item label-width="0" class="opinion_item" prop="shyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj">
-                </el-input>
-                <el-popover placement="right" width="50" trigger="hover">
+                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 
+                v-if="item.stepShjy == '1'" v-model="ruleForm.shyj"></el-input>
+                <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" 
+                v-else :disabled="true"></el-input>
+                <el-popover placement="right" width="50" trigger="hover" v-if="item.stepShjy == '1'">
                   <ul class="pointer">
                     <li @click="handleClick">复审</li>
                     <li>初审意见</li>
@@ -61,51 +28,15 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="16">
               <el-form-item label="审查人：" prop="scr">
-                {{ ruleForm.shryxm }}
+                {{ item.shryxm }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="审核时间：" prop="shjssj">
-                {{ ruleForm.shjssj }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="spyj_form">
-        <div class="item_left">
-          核定意见
-        </div>
-        <div class="item_right">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label-width="0" class="opinion_item" prop="shyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj">
-                </el-input>
-                <el-popover placement="right" width="50" trigger="hover">
-                  <ul class="pointer">
-                    <li @click="handleClick">复审</li>
-                    <li>初审意见</li>
-                  </ul>
-                  <el-button class="opinion_btn" slot="reference">常用意见</el-button>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="审查人：" prop="scr">
-                {{ ruleForm.shryxm }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审核时间：" prop="shjssj">
-                {{ ruleForm.shjssj }}
+                {{ item.shjssj }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -118,47 +49,53 @@
   </div>
 </template>
 <script>
-import { getSpyjList,saveSpyj } from "@/api/fqsq.js";
+import { getSpyjList,saveSpyj,saveSpyjBySlsq} from "@/api/fqsq.js";
 export default {
   components: {},
   props: {
-    bsmBusiness:{type:String},
-    bestepid: {type:String}
   },
   data () {
     return {
+      bsmSlsq: '',
+      bestepid: '',
       ruleForm: {
         shyj: '',
-        bsmBusiness: this.bsmBusiness,
-        stepid: this.bestepid
+        bsmSlsq: this.$route.query.bsmSlsq,
+        stepid: this.$route.query.bestepid
       },
       rules: {
         shyj: [
           { required: true, message: '请输入审批意见', trigger: 'blur' }
         ],
       },
-      unitData: []
+      tableData: [],
+      propsParam: {},
     }
   },
+  created() {
+    this.propsParam = this.$attrs;
+    this.list();
+  },
   methods: {
     handleClick () {
       console.log(1)
     },
     //审批意见数据初始化
-    list (bsmBusiness,bestepid) {
+    list () {
       var formdata = new FormData();
-      formdata.append("bsmBusiness", bsmBusiness);
-      formdata.append("bestepid", bestepid);
+      formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
+      formdata.append("bestepid", this.$route.query.bestepid);
       getSpyjList(formdata).then((res) => {
         if (res.code === 200 && res.result) {
-          this.ruleForm = {...res.result[0]}
+          this.tableData = res.result
+          this.ruleForm.shyj = res.result[res.result.length-1].shyj
         }
       })
     },
     onSubmit () { 
-       saveSpyj(this.ruleForm).then(res => {
+       saveSpyjBySlsq(this.ruleForm).then(res => {
         if (res.code === 200) {
-          
+          this.$message.success("保存成功")
         }else{
           this.$message.error(res.message)
         }
@@ -221,6 +158,7 @@ export default {
 
       .opinion {
         position: relative;
+        font-size: 16px;
 
         /deep/.el-textarea__inner {
           border: none;