Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/qgccj/ryfwbshxx.js

@@ -7,9 +7,11 @@ export const insertsyfwbzh = params =>
 //修改人员关系人信息
 export const updatesyfwbzh = params =>
   postform(`${base.alyIP}/syfwbzh/update`, params);
-//删除人员关系人信息
-// export const deletesyfwbzh = params =>
-//   post(`${base.alyIP}/syfwbzh/delete`, params);
+
 //查询人员关系人信息
 export const queryByXxzjbh = params =>
-  post(`${base.alyIP}/syfwbzh/queryByXxzjbh`, params);
\ No newline at end of file
+  post(`${base.alyIP}/syfwbzh/queryByXxzjbh`, params);
+
+  //删除服务标识号
+export const deletefwbzh = params =>
+post(`${base.alyIP}/syfwbzh/delete`, params);
\ No newline at end of file

src/components/qgccj/form.vue

@@ -1406,7 +1406,7 @@ export default {
       console.log(this.formLabelAlign);
     },
     handleChange(file, fileList, item, parentItem) {
-      console.log(11111111111111, item);
+     debugger
       var self = this;
       let isLt1M = "";
       isLt1M = file.raw.size / 1024 / 1024 < 101;
@@ -1516,7 +1516,9 @@ export default {
         });
     },
     handleBeforeRemove(file, fileList, item, parentItem) {},
-    handlerPreview(file, fileList, item, parentItem) {},
+    handlerPreview(file, fileList, item, parentItem) {
+      debugger
+    },
     httpRequest() {},
     handleAvatarSuccess(file, fileList, item) {
       console.log(item);

src/utils/params.js

@@ -9211,16 +9211,16 @@ const shrxx_jbxx = [
 ]
 //关系人基本信息
 const gxrxx_jbxx = [
-  {
-    name: "案事件编号:",
-    id: "asjbh",
-    type: "text",
-    disabled:true,
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    // prop: 'caseNumbers',
-  },
+  // {
+  //   name: "案事件编号:",
+  //   id: "asjbh",
+  //   type: "text",
+  //   disabled:true,
+  //   value: "",
+  //   placeholder: "请输入",
+  //   col: "2",
+  //   // prop: 'caseNumbers',
+  // },
   {
     name: "社会关系:",
     id: "gxrShgxShgxdm",

src/views/qgncj/zbxyr/addzbxyr.vue

@@ -19,7 +19,9 @@
           <span class="subTitle_shuxian"></span>
           <div class="subTitle_title">服务标识号</div>
         </div>
-        <el-button type="primary" size="mini" @click="add('addrygxr')"> 新增 </el-button>
+        <el-button type="primary" size="mini" @click="add('addryfwbshxx')">
+          新增
+        </el-button>
       </div>
       <el-table :data="ajList.shuju">
         <el-table-column
@@ -32,13 +34,13 @@
           align="left"
         >
           <template slot-scope="scope">
-            <div v-if="columnTitle.prop == 'asjbh'">
+            <!-- <div v-if="columnTitle.prop == 'asjbh'">
               <span
                 @click="toInfor(scope.row, 'rygxDetail')"
                 style="color: #409eff; cursor: pointer"
                 v-html="scope.row[columnTitle.prop]"
               ></span>
-            </div>
+            </div> -->
             <div
               style="
                 color: #333;
@@ -48,7 +50,6 @@
                 text-overflow: ellipsis;
               "
               :title="scope.row[columnTitle.prop]"
-              v-else
             >
               {{ scope.row[columnTitle.prop] }}
             </div>
@@ -59,10 +60,17 @@
             <el-button
               type="primary"
               size="mini"
-              @click="edit(scope.row, 'addrygxr')"
+              @click="edit(scope.row, 'addryfwbshxx')"
             >
               编辑
             </el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              @click="del(scope.row, 'addryfwbshxx')"
+            >
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -84,7 +92,9 @@
           <span class="subTitle_shuxian"></span>
           <div class="subTitle_title">人员关系</div>
         </div>
-        <el-button type="primary" size="mini" @click="add('addryfwbshxx')"> 新增 </el-button>
+        <el-button type="primary" size="mini" @click="add('addrygxr')">
+          新增
+        </el-button>
       </div>
       <el-table :data="xyrList.shuju">
         <el-table-column
@@ -97,13 +107,13 @@
           align="left"
         >
           <template slot-scope="scope">
-            <div v-if="columnTitle.prop == 'asjbh'">
+            <!-- <div v-if="columnTitle.prop == 'asjbh'">
               <span
                 @click="toInfor(scope.row, 'fwbhDetail')"
                 style="color: #409eff; cursor: pointer"
                 v-html="scope.row[columnTitle.prop]"
               ></span>
-            </div>
+            </div> -->
             <div
               style="
                 color: #333;
@@ -113,7 +123,6 @@
                 text-overflow: ellipsis;
               "
               :title="scope.row[columnTitle.prop]"
-              v-else
             >
               {{ scope.row[columnTitle.prop] }}
             </div>
@@ -124,10 +133,17 @@
             <el-button
               type="primary"
               size="mini"
-              @click="edit(scope.row, 'addryfwbshxx')"
+              @click="edit(scope.row, 'addrygxr')"
             >
               编辑
             </el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              @click="del(scope.row, 'addrygxr')"
+            >
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -161,6 +177,8 @@ import {
 } from "@/api/qgccj/flws.js";
 import { insertzp, deletezp, queryZpByXxzjbh } from "@/api/qgccj/ryzpxx.js";
 import { queryAll, fwbshqueryAllByAsjbh } from "@/api/qgccj/rygxr.js";
+import { deletefwbzh } from "@/api/qgccj/ryfwbshxx.js";
+import { deletegxr } from "@/api/qgccj/rygxr.js";
 import axios from "@/utils/http.js";
 import {
   zbfzxyr_jbxx,
@@ -319,10 +337,40 @@ export default {
     };
   },
   methods: {
+    del(item, path) {
+      let self = this;
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (path == "addryfwbshxx") {
+            deletefwbzh({
+              xxzjbh: item.xxzjbh,
+            }).then((res) => {
+              self.getAjList();
+            });
+          } else {
+            deletegxr({
+              xxzjbh: item.xxzjbh,
+              asjbh: this.asjbh,
+            }).then((res) => {
+              self.getXyrList();
+            });
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
     add(path) {
       this.$router.pushToTab({
         path: path,
-         query: {
+        query: {
           asjbh: this.asjbh,
         },
       });