Merge branch 'master' of ssh://gitlab.91isoft.com:10022/zhangtengjiao/contractmanage

src/views/list/add.vue

@@ -33,8 +33,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="合同中文名称" prop="contractCnName" >
-                    <el-input v-model.trim="form.contractCnName" placeholder="请输入" maxlength="100" :disabled="type === 'detail'"/>
+                  <el-form-item label="合同中文名称" prop="CONNAMECN" >
+                    <el-input v-model.trim="form.CONNAMECN" placeholder="请输入" maxlength="100" :disabled="type === 'detail'"/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -44,16 +44,16 @@
                       <el-option value="1" label="英语" />
                     </el-select>
                   </el-form-item>-->
-                  <el-form-item label="合同语言" prop="language" >
-                    <el-select v-model="form.language" placeholder="请选择">
+                  <el-form-item label="合同语言" prop="CONLANGUAGE" >
+                    <el-select v-model="form.CONLANGUAGE" placeholder="请选择">
                       <el-option value="0" label="汉语" />
                       <el-option value="1" label="英语" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="合同业务编码" prop="businessCode">
-                    <el-input v-model.trim="form.businessCode" placeholder="请输入" maxlength="50" />
+                  <el-form-item label="合同业务编码" prop="CONCODE">
+                    <el-input v-model.trim="form.CONCODE" placeholder="请输入" maxlength="50" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -340,6 +340,9 @@
                     :file-list="fileList">
                     <el-button size="small" type="primary">点击上传</el-button>
                   </el-upload>
+                  <el-col :span="12">
+                    <el-button type="primary" @click.stop="add">保 存</el-button>
+                  </el-col>
                 </el-row>
               </div>
             </div>
@@ -392,6 +395,19 @@ export default {
         block: 'start'
       })
     },
+    add() {
+      var formData = new FormData()
+      formData.append('CONNAMECN', '测试合同1')
+      formData.append('CONCODE', '合同业务编码1')
+
+      // eslint-disable-next-line no-undef
+      this.$axios.post('http://117.122.212.101:8090/contract/contract/add', formData)
+        .then((res) => {
+          this.$router.push({
+            path: '/admin/list/index' })
+        })
+        .catch((err) => { return err })
+    },
     parentScroll(e) {
       const target = e.target
       const pTop = target.getBoundingClientRect().top

src/views/list/detail.vue

@@ -381,7 +381,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-button type="primary" @click.stop="add">保 存</el-button>
+                    <el-button type="primary" @click.stop="update">保 存</el-button>
                   </el-col>
                 </el-row>
               </div>