Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/contractManage/components/addContract.vue

@@ -87,7 +87,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="remarks">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -192,7 +192,7 @@
             </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -297,7 +297,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -418,7 +418,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -492,7 +492,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -515,12 +515,16 @@
 
                   <selectAgent ref="member" type="22" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
 
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择居间商"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择居间商" >
+                    <template slot="append">
+                      <el-button size="small" @click="agentVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">清空</el-button>
+                    </template>
+                  </el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同:" prop="ascription_title">
+              <el-form-item label="合同:" prop="ascription_title" :rules="{ required: true, message: '请选择合同', trigger: 'change' }">
                 <el-popover
                   placement="left"
                   trigger="focus"
@@ -600,7 +604,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -1247,7 +1251,11 @@ export default {
   }
 };
 </script>
-
+<style>
+.input-with-select .el-input-group__prepend {
+  background-color: #fff;
+}
+</style>
 <style scoped>
 * {
   box-sizing: border-box;
@@ -1260,4 +1268,5 @@ export default {
 /deep/.el-select,.el-input,.el-date-editor {
   width: 100% !important;
 }
+
 </style>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -82,7 +82,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="remarks">
-                <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -187,7 +187,7 @@
                         </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -292,7 +292,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -413,7 +413,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -495,7 +495,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -518,12 +518,16 @@
 
                     <selectAgent ref="member" type="22"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="accountVisible = false"></selectAgent>
 
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename">
+                    <template slot="append">
+                      <el-button size="small" @click="accountVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">清空</el-button>
+                    </template>
+                  </el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同:" prop="ascription_title">
+              <el-form-item label="合同:" prop="ascription_title" :rules="{ required: true, message: '请选择合同', trigger: 'change' }">
                 <el-popover
                   placement="left"
                   trigger="focus"
@@ -603,7 +607,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
-                <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
+                <el-input type="textarea" size="small" v-model="form.remarks" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-form>