zpj 1 tahun lalu
induk
melakukan
832405c0df

+ 3 - 3
src/views/admin/organ/add-edit.vue

@@ -3,9 +3,9 @@
     <div class="mb-20 baC-fff sys-radius-10 box-sizing-border pd-15-10 flex-justify-space">
       <div class="fs-20 fw-600 p-15 ">{{fromData.id?'编辑机构':'新增机构'}}</div>
       <div class="align-items-center">
-        <el-button type="primary" @click="close()">返回</el-button>
-        <el-button type="warning" @click="close()">取消</el-button>
-        <el-button type="success" @click="save()">保存</el-button>
+        <el-button type="primary" icon="el-icon-back" @click="close()">返回</el-button>
+        <el-button type="warning" icon="el-icon-close" @click="close()">取消</el-button>
+        <el-button type="success" icon="el-icon-check" @click="save()">保存</el-button>
       </div>
     </div>
 

+ 3 - 3
src/views/admin/organ/list.vue

@@ -9,10 +9,10 @@
               prefix-icon="el-icon-search"
               v-model="fromData.search">
             </el-input>
-            <el-button type="primary" @click="searchFun()">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="searchFun()">查询</el-button>
         </div>
         <div class="">
-          <el-button type="success" @click="add()">新增</el-button>
+          <el-button type="success" icon="el-icon-circle-plus-outline" @click="add()">新增</el-button>
         </div>
       </div>
 
@@ -39,7 +39,7 @@
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column fixed='right' prop="" label="编辑">
               <template slot-scope="scope">
-                <el-button type="warning" @click="edit(scope.row)">编辑</el-button>
+                <el-button type="warning" icon="el-icon-edit" @click="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
         </el-table>

+ 29 - 10
src/views/admin/sign/add.vue

@@ -3,9 +3,9 @@
     <div class="mb-20 baC-fff sys-radius-10 box-sizing-border pd-15-10 flex-justify-space">
       <div class="fs-20 fw-600 p-15 ">签署合同</div>
       <div class="align-items-center">
-        <el-button type="primary" @click="close()">返回</el-button>
-        <el-button type="warning" @click="close()">取消</el-button>
-        <el-button type="success" @click="save()">保存</el-button>
+        <el-button type="primary" icon="el-icon-back" @click="close()">返回</el-button>
+        <el-button type="warning" icon="el-icon-close" @click="close()">取消</el-button>
+        <el-button type="success" icon="el-icon-check" @click="save()">保存</el-button>
       </div>
     </div>
 
@@ -29,7 +29,7 @@
           prefix-icon="el-icon-edit"
           v-model="contractName">
         </el-input>
-        <el-button type="primary" @click="selectContract()">选择合同模板</el-button>
+        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="selectContract()">选择合同模板</el-button>
       </div>
 
       <!-- 已选择合同模板 获取key名 输入val -->
@@ -63,8 +63,8 @@
             prefix-icon="el-icon-edit"
             v-model="item.id_no">
           </el-input>
-          <el-button type="primary" @click="selectUser(i)">选择个人签署</el-button>
-          <el-button type="primary" @click="selectOrgan(i)">选择机构签署</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" @click="selectUser(i)">选择个人签署</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" @click="selectOrgan(i)">选择机构签署</el-button>
         </div>
       </div>
 
@@ -107,10 +107,27 @@
         this.$router.go(-1)
       },
       save(){
-        this.fromData.textsJson = this.texts.reduce((acc,item)=>{
+        if(this.isAJAX){
+          return
+        }
+        this.isAJAX = true;
+        let list = this.texts.reduce((acc,item)=>{
           acc[item.name] = item.val
           return acc
-        },{})
+        },{});
+
+        this.fromData.textsJson = JSON.stringify(list);
+
+        this.fromData.signJson = JSON.stringify(this.sign_party);
+        signCreate(this.fromData).then((res)=>{
+          this.isAJAX = false;
+          if(res.code == 1){
+            this.$message.success(res.msg);
+            this.$router.replace({path:'/sign/list'})
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
       },
 
 
@@ -146,7 +163,8 @@
         this.$refs.userView.getList();
       },
       getUserView(e){
-
+        this.sign_party[e.index].auth_type = e.authType;
+        this.sign_party[e.index].id_no = e.psnId;
       },
       // 企业
       selectOrgan(i){
@@ -154,7 +172,8 @@
         this.$refs.organView.getList();
       },
       getOrganView(e){
-
+        this.sign_party[e.index].auth_type = e.authType;
+        this.sign_party[e.index].id_no = e.orgId;
       },
     },
   }

+ 3 - 3
src/views/admin/user/add-edit.vue

@@ -3,9 +3,9 @@
     <div class="mb-20 baC-fff sys-radius-10 box-sizing-border pd-15-10 flex-justify-space">
       <div class="fs-20 fw-600 p-15 ">{{fromData.id?'编辑人员':'新增人员'}}</div>
       <div class="align-items-center">
-        <el-button type="primary" @click="close()">返回</el-button>
-        <el-button type="warning" @click="close()">取消</el-button>
-        <el-button type="success" @click="save()">保存</el-button>
+        <el-button type="primary" icon="el-icon-back" @click="close()">返回</el-button>
+        <el-button type="warning" icon="el-icon-close" @click="close()">取消</el-button>
+        <el-button type="success" icon="el-icon-check" @click="save()">保存</el-button>
       </div>
     </div>
 

+ 3 - 3
src/views/admin/user/list.vue

@@ -9,10 +9,10 @@
               prefix-icon="el-icon-search"
               v-model="fromData.search">
             </el-input>
-            <el-button type="primary" @click="searchFun()">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="searchFun()">查询</el-button>
         </div>
         <div class="">
-          <el-button type="success" @click="add()">新增</el-button>
+          <el-button type="success" icon="el-icon-circle-plus-outline" @click="add()">新增</el-button>
         </div>
       </div>
 
@@ -39,7 +39,7 @@
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column fixed='right' prop="" label="编辑">
               <template slot-scope="scope">
-                <el-button type="warning" @click="edit(scope.row)">编辑</el-button>
+                <el-button type="warning" icon="el-icon-edit" @click="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
         </el-table>