Merge remote-tracking branch 'origin/master'

src/store/index.js

@@ -18,8 +18,15 @@ export default new Vuex.Store({
     enhance,
     online
   },
-  state: {},
+  state: {
-  mutations: {},
+    // 当前的项目
+    currentProjetcInfo:{}
+  },
+  mutations: {
+    "SET_CURRENTPROJECT":(state,info) =>{
+      state.currentProjetcInfo = Object.assign({},info)
+    }
+  },
   actions: {},
   getters
 });

src/views/incomePayments/memberManage/MemberProjectList.vue

@@ -147,7 +147,7 @@ export default {
           record:JSON.stringify(record)
         }
       })
-    }
+    },
   }
 }
 </script>

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: {
     /*

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-blue {
-  color: dodgerblue;
+  color: #069f99;
   cursor: pointer;
 }
 </style>

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>

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 是合同·-->
+          <!--  incomePaysType 2 是合同·-->
-          <a-col :xl="12" :sm="24" v-if="incomePaysType === '1'">
+          <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  是收费通知·-->
+        <!--  incomePaysType 3  是收费通知·-->
-        <a-row :gutter="24" v-if="incomePaysType === '2' ">
+        <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,7 +254,8 @@ export default {
             method = 'put'
           }
           const formData = Object.assign(this.model, values)
-          console.log('表单提交数据', formData)
+          formData.companyId = values.companyId.id
+          formData.projectId = this.$store.state.currentProjetcInfo.id
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
@@ -318,6 +321,12 @@ export default {
       this.selectedCompany = {}
       this.close()
     },
+    /*
+    * 筛选
+    * */
+    filterOption(input,option){
+      console.log("inp",option)
+    }
   }
 }
 </script>

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();