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

@@ -97,6 +97,23 @@ export function stepExpandInfo (data) {
     })
 }
 
+// 获取审批意见
+export function getSpyjList (data) {
+    return request({
+        url: '/business/workFlow/getSpyjList',
+        method: 'post',
+        data
+    })
+}
+
+// 保存审批意见
+export function saveSpyj (data) {
+    return request({
+        url: '/business/workFlow/saveSpyj',
+        method: 'post',
+        data
+    })
+}
 // 登簿接口
 export function record (data) {
     return request({

@@ -138,6 +138,8 @@ export default {
               message: '删除成功!'
             });
             this.fetchData()
+          }else {
+          this.$message.error(res.message);
           }
         })
       }).catch(() => {

@@ -13,8 +13,8 @@
         <div class="item_right">
           <el-row>
             <el-col :span="24">
-              <el-form-item label-width="0" class="opinion_item" prop="csyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj">
+              <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">
@@ -28,18 +28,13 @@
           </el-row>
 
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="审查人" prop="scr">
-                {{ ruleForm.scr }}
+            <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="shkssj">
-                {{ ruleForm.shkssj }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审核结束时间" prop="shjssj">
+              <el-form-item label="审核时间：" prop="shjssj">
                 {{ ruleForm.shjssj }}
               </el-form-item>
             </el-col>
@@ -53,8 +48,8 @@
         <div class="item_right">
           <el-row>
             <el-col :span="24">
-              <el-form-item label-width="0" class="opinion_item" prop="csyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj">
+              <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">
@@ -68,18 +63,13 @@
           </el-row>
 
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="审查人" prop="scr">
-                {{ ruleForm.scr }}
+            <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="shkssj">
-                {{ ruleForm.shkssj }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审核结束时间" prop="shjssj">
+              <el-form-item label="审核时间：" prop="shjssj">
                 {{ ruleForm.shjssj }}
               </el-form-item>
             </el-col>
@@ -93,8 +83,8 @@
         <div class="item_right">
           <el-row>
             <el-col :span="24">
-              <el-form-item label-width="0" class="opinion_item" prop="csyj">
-                <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj">
+              <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">
@@ -108,18 +98,13 @@
           </el-row>
 
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="审查人" prop="scr">
-                {{ ruleForm.scr }}
+            <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="shkssj">
-                {{ ruleForm.shkssj }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审核结束时间" prop="shjssj">
+              <el-form-item label="审核时间：" prop="shjssj">
                 {{ ruleForm.shjssj }}
               </el-form-item>
             </el-col>
@@ -127,32 +112,60 @@
         </div>
       </div>
       <div class="submit_button">
-        <el-button type="primary">保存</el-button>
+        <el-button type="primary"  @click="onSubmit">保存</el-button>
       </div>
     </el-form>
   </div>
 </template>
 <script>
-
+import { getSpyjList,saveSpyj } from "@/api/fqsq.js";
 export default {
   components: {},
+  props: {
+    bsmBusiness:{type:String},
+    bestepid: {type:String}
+  },
   data () {
     return {
       ruleForm: {
-        csyj: '',
-        scr: '',
+        shyj: '',
+        bsmBusiness: this.bsmBusiness,
+        stepid: this.bestepid
       },
       rules: {
-        csyj: [
+        shyj: [
           { required: true, message: '请输入审批意见', trigger: 'blur' }
         ],
-      }
+      },
+      unitData: []
     }
   },
   methods: {
     handleClick () {
       console.log(1)
-    }
+    },
+    //审批意见数据初始化
+    list (bsmBusiness,bestepid) {
+      var formdata = new FormData();
+      formdata.append("bsmBusiness", bsmBusiness);
+      formdata.append("bestepid", bestepid);
+      getSpyjList(formdata).then((res) => {
+        if (res.code === 200 && res.result) {
+          this.ruleForm = {...res.result[0]}
+        }
+      })
+    },
+    onSubmit () { 
+       saveSpyj(this.ruleForm).then(res => {
+        if (res.code === 200) {
+          
+        }else{
+          this.$message.error(res.message)
+        }
+      })
+       
+    },
+    
   },
 }
 </script>

@@ -185,12 +185,21 @@ export default {
       }
     },
     //  左侧列表点击调用接口
-    unitClick(item) {
-      this.taskId = item.taskId;
-      this.bsmBusiness = item.bsmBusiness;
-      this.$nextTick(() => {
-        this.$refs.slxx[0].list(item.bsmSldy);
-      });
+    unitClick (item) {  
+      this.taskId = item.taskId
+      this.bsmBusiness = item.bsmBusiness
+      var activeTabName = this.activeName
+      if(activeTabName == 'slxx'){
+        //受理信息页面接口调取
+        this.$nextTick(() => {
+          this.$refs.slxx[0].list(item.bsmSldy)
+        })
+      }else if(activeTabName == 'spyj'){
+        //审批页面接口调取
+        this.$nextTick(() => {
+          this.$refs.spyj[0].list(this.bsmBusiness,this.queryForm.bestepid)
+        })  
+      }
     },
     operation(index, item) {
       let that = this;

-import filter from '@/utils/filter.js'
-let vm = null
-
-const sendThis = (_this) => {
-  vm = _this
-}
-class data extends filter {
-  constructor() {
-    super()
-  }
-  columns () {
-    return [
-      {
-        type: 'selection',
-        label: '全选'
-      },
-      {
-        label: '序号',
-        type: 'index',
-        width: '50',
-        render: (h, scope) => {
-          return (
-            <div>
-              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
-            </div>
-          )
-        }
-      },
-      {
-        prop: "status",
-        label: "状态",
-      },
-      {
-        prop: "qllx",
-        label: "权利类型",
-      },
-      {
-        prop: "zddm",
-        label: "宗地代码",
-      },
-      {
-        prop: "bdcdyh",
-        label: "不动产单元号",
-      },
-      {
-        prop: "qlxz",
-        label: "权利性质",
-      },
-      {
-        prop: "zdmj",
-        label: "宗地面积",
-      },
-      {
-        prop: "qlsdfs",
-        label: "权利设定方式",
-      },
-      {
-        prop: "tdyt",
-        label: "土地用途",
-      },
-      {
-        prop: "zl",
-        label: "坐落",
-      },
-    ]
-  }
-
-
-}
-let datas = new data()
-export {
-  datas,
-  sendThis
-}