合同更新

src/views/project/contract/components/base.vue

@@ -23,6 +23,9 @@
                                         <el-option v-for="item in contractTypeval" :label="item.dictName" :value="item.dictValue"/>
                                     </el-select>
                         </el-form-item>
+                        <el-form-item label="合同金额：" prop="contractMoney">
+                            <el-input v-model="formBaseModel.contractMoney"/>
+                        </el-form-item>
                         <el-form-item label="所属项目：" prop="projectId" block clearable placeholder="所属项目：">
                             <el-select block v-model="formBaseModel.projectId">
                                 <el-option v-for="item in projectListval" :label="item.name" :value="item.id"/>
@@ -41,10 +44,10 @@
                             <el-input v-model="formBaseModel.returnedUserPhone"/>
                         </el-form-item>
                         <el-form-item label="合同已履约回款：">
-                            <el-input v-model="formBaseModel.returnedMoney"/>
+                            <el-input v-model="formBaseModel.returnedMoney" disabled/>
                         </el-form-item>
                         <el-form-item label="合同未履约回款：">
-                            <el-input v-model="formBaseModel.unreturnedMoney"/>
+                            <el-input v-model="formBaseModel.unreturnedMoney" disabled/>
                         </el-form-item>
                     </el-form>
                 </el-scrollbar>

src/views/project/contract/components/milestone.vue

@@ -12,7 +12,7 @@
         <HcTable :column="tableColumn" :datas="infoData">
             <template #returnedCondition="{row,index}">
                 <span v-if="isDisabled">{{row.returnedCondition}}</span>
-                <el-input v-model="row.returnedCondition" v-else/>
+                <el-input v-model="row.returnedCondition" v-else />
             </template>
             <template #shouldReturnedTime="{row,index}">
                 <span v-if="isDisabled">{{row.shouldReturnedTime}}</span>
@@ -24,11 +24,11 @@
             </template>
             <template #practicalReturnedTime="{row,index}">
                 <span v-if="isDisabled">{{row.practicalReturnedTime}}</span>
-                <el-date-picker class="block" v-model="row.practicalReturnedTime" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" v-else/>
+                <el-date-picker class="block" v-model="row.practicalReturnedTime" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" v-else disabled/>
             </template>
             <template #practicalReturnedMoney="{row,index}">
                 <span v-if="isDisabled">{{row.practicalReturnedMoney}}</span>
-                <el-input v-model="row.practicalReturnedMoney" v-else/>
+                <el-input v-model="row.practicalReturnedMoney" v-else disabled/>
             </template>
             <template #reminderUserName="{row,index}">
                 <span v-if="isDisabled">{{row.reminderUserName}}</span>

src/views/project/contract/update.vue

@@ -18,14 +18,14 @@
                 <el-table-column prop="shouldReturnedMoney" label="应收回款金额" align="center"/>
                 <el-table-column prop="practicalReturnedTime" label="实际回款时间" align="center">
                     <template #default="{ row }">
-                        <span v-if="row.practicalReturnedTime">{{row.practicalReturnedTime}}</span>
-                        <el-date-picker class="block" v-model="row.practicalReturnedTime" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" v-else/>
+                        <!-- <span v-if="row.practicalReturnedTime">{{row.practicalReturnedTime}}</span> -->
+                        <el-date-picker class="block" v-model="row.practicalReturnedTime" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
                     </template>
                 </el-table-column>
                 <el-table-column prop="practicalReturnedMoney" label="实际回款金额" align="center">
                     <template #default="{ row }">
-                        <span v-if="row.practicalReturnedMoney">{{row.practicalReturnedMoney}}</span>
-                        <el-input v-model="row.practicalReturnedMoney" v-else/>
+                        <!-- <span v-if="row.practicalReturnedMoney">{{row.practicalReturnedMoney}}</span> -->
+                        <el-input v-model="row.practicalReturnedMoney" />
                     </template>
                 </el-table-column>
                 <el-table-column prop="reminderUser" label="催款执行人" align="center"/>

src/views/project/list/index.vue

@@ -49,7 +49,9 @@
                 <span class="text-blue text-hover" @click="rowClick(row)">{{row.name}}</span>
             </template>
             <template #key7="{row}">
-                <span class="text-blue text-hover">{{row.startTime+'~'+row.endTime}}</span>
+                <span class="text-blue ">{{row.startTime?row.startTime:''}}</span>
+                <span class="text-blue " v-if="row.endTime">~</span>
+                <span class="text-blue ">{{row.endTime?row.endTime:''}}</span>
             </template>
             <template #action="{row,index}">
                 <el-button plain size="small" type="primary" @click="editRowClick(row)">编辑</el-button>

src/views/project/list/list-info.vue

@@ -31,7 +31,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="起止日期：">
-                                    <HcDatePicker :dates="probetweenTime" clearable @change="betweenTimeUpdate" size="large" disabled="disabled"/>
+                                    <HcDatePicker :dates="probetweenTime" clearable @change="betweenTimeUpdate" size="large" />
                                 </el-form-item>
                                 <el-form-item label="合同额：">
                                     <el-input v-model="formModel.contractMoney" disabled="disabled"/>
@@ -86,7 +86,7 @@
                                 </div>
                                 <div class="hac-time-line-time picker" v-if="item.editTime">
                                     <div class="picker-box">
-                                        <HcDatePicker :dates="item.betweenTime" clearable @change="betweenTimeUpdate($event,item)"/>
+                                        <HcDatePicker :dates="item.betweenTime" clearable @change="probetweenTimeUpdate($event,item)"/>
                                     </div>
                                     <div class="icon-box text-blue text-hover" @click="item.editTime = false">
                                         <HcIcon name="check"/>
@@ -233,12 +233,21 @@ const formRules = {
 
 //日期时间被选择
 const probetweenTime = ref(null)
-const probetweenTimeUpdate = ({arr, query}) => {
+const betweenTimeUpdate = ({arr, query}) => {
+    console.log(arr,'arr');
     probetweenTime.value = arr
     formModel.value.betweenTime = query
+    formModel.value.startTime=arr[0]
+    formModel.value.endTime=arr[1]
+    console.log(formModel.value.startTime,'sta');
+    if(arr.length===0){
+        formModel.value.startTime=''
+        formModel.value.endTime=''
+        console.log( formModel.value.endTime,'end');
+    }
 }
 const betweenTime = ref(null)
-const betweenTimeUpdate = ({arr, query},item) => {
+const probetweenTimeUpdate = ({arr, query},item) => {
     betweenTime.value = arr
     item.processStartTime=arr[0]
     item.processEndTime=arr[1]