From 768031ab73938e38531fbd007aa334d800a6cf24 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 27 Aug 2021 15:10:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafeguardStardsMemberList.vue             |  6 ++---
 .../memberManage/StardsMemberProjectList.vue  |  2 +-
 .../modules/SafeguardMemberModal.vue          | 23 +++++++++++++------
 src/views/system/DictDeleteList.vue           |  6 ++---
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 533905f..51a61f2 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -52,7 +52,7 @@
         </template>
 
         <template slot="detail" slot-scope="text,record">
-          <div @click="openDetailModal(record)" class="">企业名称</div>
+          <div @click="openDetailModal(record)" class="color-blue">企业名称</div>
         </template>
 
         <template slot="text" slot-scope="text">
@@ -182,8 +182,8 @@ export default {
 
 <style scoped>
 @import '~@assets/less/common.less';
-.color_blue {
-  color: dodgerblue;
+.color-blue {
+  color: #069f99;
   cursor: pointer;
 }
 </style>
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index ff1473e..feeb06a 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -118,7 +118,7 @@ export default {
 @import '~@assets/less/common.less';
 
 .color_blue {
-  color: dodgerblue;
+  color: #069f99;
   cursor: pointer;
 }
 </style>
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index de6f3c5..002a32c 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -45,7 +45,9 @@
             <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
               <a-row :gutter="20">
                 <a-col :span="20">
-                  <a-select placeholder="请选择企业联系人"
+                  <a-select placeholder="请选择邮寄联系人"
+                            show-search
+                            :filter-option="filterOption"
                             v-decorator="['postContactId',validatorRules.postContactId]"
                   >
                     <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{
@@ -83,13 +85,13 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['paymentMethod',validatorRules.paymentMethod]" @change="changePaymentMethod">
-                <a-radio :value="1">合同</a-radio>
-                <a-radio :value="2">收费通知</a-radio>
+                <a-radio :value="2">合同</a-radio>
+                <a-radio :value="3">收费通知</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
-          <!--  incomePaysType 1 是合同·-->
-          <a-col :xl="12" :sm="24" v-if="incomePaysType === '1'">
+          <!--  incomePaysType 2 是合同·-->
+          <a-col :xl="12" :sm="24" v-if="incomePaysType === '2'">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入合同号"
                        :maxLength='50'
@@ -98,8 +100,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <!--  incomePaysType 2  是收费通知·-->
-        <a-row :gutter="24" v-if="incomePaysType === '2' ">
+        <!--  incomePaysType 3  是收费通知·-->
+        <a-row :gutter="24" v-if="incomePaysType === '3' ">
           <a-col :xl="12" :sm="24">
             <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入收费通知号"
@@ -252,6 +254,7 @@ export default {
             method = 'put'
           }
           const formData = Object.assign(this.model, values)
+          formData.companyId = values.companyId.id
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
@@ -318,6 +321,12 @@ export default {
       this.selectedCompany = {}
       this.close()
     },
+    /*
+    * 筛选
+    * */
+    filterOption(input,option){
+      console.log("inp",option)
+    }
   }
 }
 </script>
diff --git a/src/views/system/DictDeleteList.vue b/src/views/system/DictDeleteList.vue
index f16203c..4d4c7c1 100644
--- a/src/views/system/DictDeleteList.vue
+++ b/src/views/system/DictDeleteList.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-  import { getAction,deleteAction,putAction } from '@api/manage'
+  import { getAction, putAction ,postAction} from '@api/manage'
   import JEllipsis from "@comp/jero/JEllipsis";
   export default {
     name: "DictDeleteList",
@@ -110,7 +110,7 @@
         })
       },
       handleBack(id){
-        putAction("/sys/dict/back/"+id).then(res=>{
+        postAction("/sys/dict/back/"+id).then(res=>{
           if(res.success){
             this.$message.success(res.message)
             this.loadData();
@@ -129,7 +129,7 @@
           centered: false,
           onOk: () => {
           var that = this;
-          deleteAction("/sys/dict/deletePhysic/"+id).then((res) => {
+         getAction("/sys/dict/deletePhysic/"+id).then((res) => {
             if (res.success) {
               this.$message.success(res.message)
               this.loadData();

From b4ce240f1101eda7fb0ca9776432711a0a12f598 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 27 Aug 2021 16:07:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                                    | 11 +++++++++--
 .../incomePayments/memberManage/MemberProjectList.vue |  2 +-
 .../memberManage/SafeguardMemberList.vue              |  1 +
 .../memberManage/modules/SafeguardMemberModal.vue     |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index e38332d..322186a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -18,8 +18,15 @@ export default new Vuex.Store({
     enhance,
     online
   },
-  state: {},
-  mutations: {},
+  state: {
+    // 当前的项目
+    currentProjetcInfo:{}
+  },
+  mutations: {
+    "SET_CURRENTPROJECT":(state,info) =>{
+      state.currentProjetcInfo = Object.assign({},info)
+    }
+  },
   actions: {},
   getters
 });
diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue
index 8a53a41..23fb19b 100644
--- a/src/views/incomePayments/memberManage/MemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/MemberProjectList.vue
@@ -147,7 +147,7 @@ export default {
           record:JSON.stringify(record)
         }
       })
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index e4e1a4b..655eddb 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -203,6 +203,7 @@ export default {
   created() {
     this.currentInfo = Object.assign({},JSON.parse(this.$route.query.record))
     console.log("=====",this.currentInfo)
+    this.$store.commit('SET_CURRENTPROJECT',  this.currentInfo )
   },
   methods: {
     /*
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 002a32c..0b58753 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -255,7 +255,7 @@ export default {
           }
           const formData = Object.assign(this.model, values)
           formData.companyId = values.companyId.id
-          console.log('表单提交数据', formData)
+          formData.projectId = this.$store.state.currentProjetcInfo.id
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
               that.$message.success(res.message)