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

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'

@@ -45,4 +45,15 @@ export function logoutReg (data) {
         method: 'post',
         data
     })
+}
+// 流程图
+export function getWorkFlowImage (bsmSlsq) {
+    return request({
+        url: '/business/workFlow/getWorkFlowImage',
+        method: 'get',
+        responseType: 'blob',
+        params: {
+            bsmSlsq: bsmSlsq
+        }
+    })
 }
\ No newline at end of file

@@ -16,7 +16,8 @@ export function getZsglrkList (data) {
     return request({
         url: '/sys/zsgl/getZsglrkList',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 
@@ -58,7 +59,8 @@ export function getZsglffList (data) {
     return request({
         url: '/sys/zsgl/getZsglffList',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 
@@ -109,7 +111,8 @@ export function getZssyqkList (data) {
     return request({
         url: '/sys/zsgl/getZssyqkList',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 

@@ -2,7 +2,7 @@
 
 @mixin colorBtn($color) {
   background: $color;
-  color:#fff;
+  color: #fff;
 
   &:hover {
     color: #fff;
@@ -99,15 +99,9 @@
   font-size: 14px;
   border-radius: 4px;
 }
+
 // 搜索框按钮的位置
-.btnCol{
+.btnCol {
   box-sizing: border-box;
   text-align: right;
-}
-
-// 默认白色按钮样式
-.el-button--default{
-  background: #FBFCFD;
-  border: 1px solid #E4EBF4;
-  border-radius: 4px;
-}
+}
\ No newline at end of file

@@ -2,11 +2,11 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" label-width="80px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源">
-              <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
+              <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源">
                 <el-option v-for="item in dictData['ywly']" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -14,16 +14,16 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
-                <el-option v-for="item in dictData['A8']" :key="item.value" :label="item.label" :value="item.value">
+              <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
+                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
-                <el-option v-for="item in dictData['A21']" :key="item.value" :label="item.label" :value="item.value">
+              <el-select v-model="queryForm.djlx" filterable class="width100" clearable placeholder="请选择登记类型">
+                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
             </el-form-item>

@@ -2,62 +2,37 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" label-width="80px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="查询编号">
-              <el-input
-                placeholder="请输入编号"
-                v-model="queryForm.cxbh"
-                clearable
-              >
+              <el-input placeholder="请输入编号" v-model="queryForm.cxbh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="申请人">
-              <el-input
-                placeholder="请输入申请人"
-                v-model="queryForm.sqr"
-                clearable
-              >
+              <el-input placeholder="请输入申请人" v-model="queryForm.sqr" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="查询用途">
-              <el-select
-                v-model="queryForm.cxyt"
-                filterable
-                clearable
-                placeholder="请选择用途"
-              >
-                <el-option
-                  v-for="item in cxytOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+              <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途">
+                <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="业务号">
-              <el-input
-                placeholder="请输入业务号"
-                v-model="queryForm.ywh"
-                clearable
-                class="width200px"
-              >
+              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="btnCol">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="fetchData"
-                >查询</el-button
-              >
+              <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
           </el-col>
@@ -66,16 +41,9 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table
-        :page-size="pageData.size"
-        border
-        :current-page.sync="pageData.current"
-        :total="tableData.total"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-      >
+      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
     </div>
   </div>
@@ -88,10 +56,10 @@ export default {
   name: "jtfc",
   components: {},
   mixins: [table],
-  mounted() {
+  mounted () {
     sendThis(this);
   },
-  data() {
+  data () {
     return {
       sqrOption: [],
       cxytOption: [],
@@ -121,14 +89,14 @@ export default {
   },
   methods: {
     // 初始化数据
-    fetchData() {
+    fetchData () {
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         let { records, total } = res.result;
         // this.tableData.data = records
         this.tableData.total = total;
       });
     },
-    handleSort(name, sort) {
+    handleSort (name, sort) {
       console.log(name, sort);
     },
   },

@@ -2,7 +2,7 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" label-width="80px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="查询编号">
@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="查询用途">
-              <el-select v-model="queryForm.cxyt" filterable clearable placeholder="请选择用途">
+              <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途">
                 <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>

@@ -2,11 +2,11 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" label-width="80px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源">
-              <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
+              <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源">
                 <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
+              <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
                 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
+              <el-select v-model="queryForm.djlx" class="width100" filterable clearable placeholder="请选择登记类型">
                 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>

@@ -99,20 +99,9 @@ class data extends filter {
             </div>
           )
         }
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>删除</el-button>
-        }
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -123,6 +123,7 @@
   left: 0%;
 }
 
+
 .topButton {
   @include flex;
   width: 100%;

@@ -56,6 +56,9 @@
         </div>
       </div>
     </div>
+    <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false">
+      <img :src="imgSrc" style="margin: 20px 0" />
+    </dialogBox>
   </div>
 </template>
 
@@ -72,10 +75,14 @@ import {
   getNextLinkInfo,
   completeTask,
 } from "@/api/fqsq.js";
+import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getForm } from "./flowform.js";
 export default {
   data () {
     return {
+      // 流程图
+      imgSrc: '',
+      myValue: false,
       // 折叠
       isShowdrawer: true,
       // 默认选中
@@ -144,6 +151,12 @@ export default {
     operation (index, item) {
       let that = this;
       switch (item.value) {
+        case "B1":
+          getWorkFlowImage(this.bsmSlsq).then(res => {
+            this.imgSrc = URL.createObjectURL(res)
+            this.myValue = true
+          })
+          break;
         case "zsyl":
           this.zsylFlag = true;
           break;
@@ -173,7 +186,6 @@ export default {
             }
           });
           //  this.$alert(res.result);
-
           break;
         case "tc":
           window.close();
@@ -239,8 +251,6 @@ export default {
           h("i", { style: "color: teal" }, obj.usernames.join("，")),
         ]),
         showCancelButton: true,
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
         beforeClose: (action, instance, done) => {
           if (action === "confirm") {
             instance.confirmButtonLoading = true;
@@ -267,10 +277,10 @@ export default {
       }).then((action) => {
         this.$message({
           type: "info",
-          message: "action: " + action,
-        });
-      });
-    },
-  },
-};
+          message: "action: " + action
+        })
+      })
+    }
+  }
+}
 </script>
\ No newline at end of file

@@ -2,11 +2,11 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" label-width="80px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源">
-              <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
+              <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源">
                 <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
+              <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
                 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
+              <el-select v-model="queryForm.djlx" class="width100" filterable clearable placeholder="请选择登记类型">
                 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>

@@ -75,15 +75,6 @@ class data extends filter {
             </div>
           )
         }
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
-        }
       }
     ]
   }

@@ -136,7 +136,8 @@ export default {
         removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => {
           if (res.code == 200) {
             this.$message.success("删除成功")
-            this.fetchData();
+            this.handleDel()
+            this.fetchData()
           } else {
             this.$message.error(res.message)
           }

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "batchno",

@@ -44,7 +44,7 @@ import viewDialog from "../components/viewDialog.vue";
 import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
 export default {
   name: "zsrk",
-  components: { addDialog,viewDialog },
+  components: { addDialog, viewDialog },
   mixins: [table],
   mounted () {
     sendThis(this);
@@ -89,6 +89,7 @@ export default {
     //修改筛选时间
     timeChange (val) {
       if (this.ruleForm.rksj != null) {
+        
         this.ruleForm.rkkssj = this.ruleForm.rksj[0];
         this.ruleForm.rkjssj = this.ruleForm.rksj[1];
       } else {
@@ -106,7 +107,8 @@ export default {
         removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => {
           if (res.code == 200) {
             this.$message.success("删除成功")
-            this.fetchData();
+            this.handleDel()
+            this.fetchData()
           } else {
             this.$message.error(res.message)
           }

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "batchno",

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         label: "状态",