fix:bug修复及优化

src/views/FinancialManagement/ContractManagement/ContractManagement.vue

@@ -217,6 +217,18 @@
         </template>
       </el-table-column>
       <el-table-column prop="shouldPostponedDate" label="顺延时间" width="180">
+        <template slot-scope="scope">
+          {{ scope.row.dateTime }}
+          {{
+            scope.row.dateType == "year"
+              ? "年"
+              : scope.row.dateType == "month"
+              ? "月"
+              : scope.row.dateType == "days"
+              ? "天"
+              : ""
+          }}
+        </template>
       </el-table-column>
 
       <el-table-column
@@ -597,6 +609,10 @@
                 accept=".pdf,.docx"
               >
                 <el-button size="small" type="primary">点击上传</el-button>
+                <span></span>
+                <div slot="tip" class="el-upload__tip">
+                  文件类型仅支持docx/pdf格式文件
+                </div>
                 <!-- <div slot="tip" class="el-upload__tip">
                   只能上传jpg/png文件，且不超过500kb
                 </div> -->
@@ -709,6 +725,27 @@
           <el-row>
             <el-form :model="form" :inline="true" :disabled="true">
               <el-col :span="12">
+                <el-form-item
+                  label="合同状态"
+                  label-width="130px"
+                  prop="contractStatus"
+                >
+                  <!-- <el-input
+                    size="small"
+                    v-model="item.contractStatus"
+                    autocomplete="off"
+                    :disabled="true"
+                    style="width: 220px"
+                  ></el-input> -->
+                  <el-select
+                    size="small"
+                    v-model="item.contractStatus"
+                    style="width: 220px"
+                  >
+                    <el-option value="1" label="失效">失效</el-option>
+                    <el-option value="0" label="有效">有效</el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="合同编号" label-width="130px">
                   <el-input
                     size="small"
@@ -1280,6 +1317,11 @@ export default {
                       return v.fileId;
                     })
                   : [];
+              this.date = res.data.dateType;
+              this.year = res.data.dateType == "year" ? res.data.dateTime : "";
+              this.month =
+                res.data.dateType == "month" ? res.data.dateTime : "";
+              this.days = res.data.dateType == "days" ? res.data.dateTime : "";
               if (commad == "supplement") {
                 this.$nextTick(() => {
                   this.$refs.ruleForm.clearValidate();
@@ -1429,9 +1471,16 @@ export default {
                   ...this.supplierIdChildList,
                 ],
                 filePathIdList: this.fileIdList,
-                yearTime: this.date == "year" ? this.year : "",
-                monthTime: this.date == "month" ? this.month : "",
-                dayTime: this.date == "day" ? this.days : "",
+                // yearTime: this.date == "year" ? this.year : "",
+                // monthTime: this.date == "month" ? this.month : "",
+                dateTime:
+                  this.date == "day"
+                    ? this.days
+                    : this.date == "year"
+                    ? this.year
+                    : this.date == "month"
+                    ? this.month
+                    : "",
                 dateType: this.date,
               })
               .then((res) => {
@@ -1455,9 +1504,14 @@ export default {
                   ...this.supplierIdChildList,
                 ],
                 filePathIdList: this.fileIdList,
-                yearTime: this.date == "year" ? this.year : "",
-                monthTime: this.date == "month" ? this.month : "",
-                dayTime: this.date == "day" ? this.days : "",
+                dateTime:
+                  this.date == "day"
+                    ? this.days
+                    : this.date == "year"
+                    ? this.year
+                    : this.date == "month"
+                    ? this.month
+                    : "",
                 dateType: this.date,
               })
               .then((res) => {
@@ -1653,10 +1707,11 @@ export default {
                     return v.fileId;
                   })
                 : [];
-            // this.year = res.data.yearTime;
-            // this.month = res.data.monthTime;
-            // this.day = res.data.dayTime;
-            // this.date = this.dateType;
+
+            this.date = res.data.dateType;
+            this.year = res.data.dateType == "year" ? res.data.dateTime : "";
+            this.month = res.data.dateType == "month" ? res.data.dateTime : "";
+            this.days = res.data.dateType == "days" ? res.data.dateTime : "";
           }
         });
     },

src/views/FinancialManagement/ContractManagement/ContractStatement.vue

@@ -11,7 +11,7 @@
           <el-form-item label="合同信息">
             <el-input
               v-model="formInline.contractCode"
-              placeholder="请输入合同信息"
+              placeholder="请输入合同编码或者合同名称"
               size="small"
               style="width: 220px"
             ></el-input>
@@ -355,7 +355,6 @@ export default {
     },
     //获取合同列表
     getList() {
-      console.log();
       this.$api.contract
         .supplierContractPage({
           ...this.pageInfo,