暂存

src/HDrpManagement/contractManage/components/addContract.vue

@@ -175,7 +175,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="收货人:" prop="projectname">
+              <el-form-item label="收货人:" prop="receiptName">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -470,6 +470,9 @@ export default {
         projectname: [
           { required: true, message: '请选择项目', trigger: 'change' },
         ],
+        receiptName: [
+          { required: true, message: '请选择收货人', trigger: 'change' },
+        ],
         salername: [
           { required: true, message: '请选择业务员', trigger: 'change' },
         ],

src/HDrpManagement/contractManage/components/contractClause/contractClause.vue

@@ -52,10 +52,10 @@
               </el-select>
             </el-descriptions-item>
             <el-descriptions-item label="付款方式(合同条款)">
-              <el-input v-model="clause[0].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
-              <el-input v-model="clause[1].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
-              <el-input v-model="clause[2].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
-              <el-input v-model="clause[3].content" placeholder="请填写" :disabled="editShow"></el-input>
+              <el-input autosize type="textarea" v-model="clause[0].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input autosize type="textarea" v-model="clause[1].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input autosize type="textarea" v-model="clause[2].content" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input autosize type="textarea" v-model="clause[3].content" placeholder="请填写" :disabled="editShow"></el-input>
             </el-descriptions-item>
           </el-descriptions>
         </div>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -21,6 +21,10 @@
               :deletebtn="false"
             ></previewImage>
           </div>
+          <div v-else-if="scope.column.columnname == 'remarks'">
+            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.remarks" @change="remarksChange($event,scope.column.data,scope.column.data.index)"></el-input>
+            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+          </div>
           <div v-else-if="scope.column.columnname == 'discountrate'">
             <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @change="discountrateChange($event,scope.column.data,scope.column.data.index)"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
@@ -142,6 +146,9 @@ export default {
       console.log(num);
       
     },
+    remarksChange (val,data,index){
+      this.$set(this.list,index,data)
+    },
     discountrateChange (num,data,index) {
       console.log(num,data,index)
       if (num>100){

src/HDrpManagement/contractManage/modules/detail.vue

@@ -96,34 +96,6 @@
         </productClassList>
         <!--合同条款-->
         <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
-<!--          <el-button
-            v-if="tool.checkAuth($route.name,'contractClauseManage')"
-            size="small" 
-            type="primary" 
-            slot="addProduct" 
-            class="inline-16"
-            @click="$refs.Claus.list.unshift({content:'',sa_contract_clauseid:0}),$refs.Claus.editIndex=0,$refs.Claus.form.sa_contract_clauseid=0"
-            :disabled="mainData.status != '新建' || !isLeader" 
-          >添 加</el-button>-->
-<!--          <template v-slot:edit="scope">
-            <el-button 
-              v-if="tool.checkAuth($route.name,'contractClauseManage')"
-              class="inline-16" 
-              :disabled="mainData.status != '新建' || scope.data.editable != 1 || !isLeader"
-              type="text" size="mini" slot="edit" 
-              @click="$refs.Claus.currentEdit = scope.data;$refs.Claus.form = Object.assign({},$refs.Claus.form,scope.data)"
-            >编 辑</el-button>
-          </template>
-
-          <template v-slot:del="scope">
-            <delete-btn
-             :nameId="20221128160302" 
-             nameKey="sa_contract_clauseids"
-             :message="message"
-             :id="scope.data.sa_contract_clauseid" @deleteSuccess="$refs.Claus.listData()"
-             v-if="scope.data.sa_contract_clauseid !== 0"
-            ></delete-btn>
-          </template>-->
         </contractClause>
       </div>
       <div slot="slot2">

src/SManagement/user/user-info/components/baseInfo.vue

@@ -18,6 +18,10 @@
         <el-input v-model="ruleForm.phonenumber" size="small" :placeholder="ruleForm.phonenumber" :disabled="true"></el-input>
         <slot :data="userInfo" name="phoneEdit"></slot>
       </el-form-item>
+      <el-form-item label="登录账号:" >
+        <el-input v-model="ruleForm.accountno" size="small" :disabled="true"></el-input>
+<!--        <slot :data="userInfo" name="phoneEdit"></slot>-->
+      </el-form-item>
       <el-form-item label="密码:" prop="pass">
         <el-input v-model="ruleForm.pass" size="small" placeholder="******" :disabled="true"></el-input>
         <slot :data="userInfo" name="passEdit"></slot>
@@ -51,7 +55,8 @@ export default {
         name:'',
         phonenumber:'',
         pass:'******',
-        email:''
+        email:'',
+        accountno:''
       },
       rules: {
         name:[
@@ -117,6 +122,7 @@ export default {
         this.ruleForm.name = val.name
         this.ruleForm.phonenumber = val.phonenumber
         this.ruleForm.email = val.hr.email
+        this.ruleForm.accountno = val.accountno
       }
     },
     editStatus: {