fix:bug修复

src/components/PeopleImage/index.vue

@@ -29,23 +29,39 @@
             :before-upload="beforeAvatarUpload"
             :on-preview="handlePictureCardPreview"
           >
-            <img v-if="dataForm.SFZ_01" :src="dataForm.SFZ_01" class="avatar"/>
+            <img v-if="dataForm.SFZ_01" :src="dataForm.SFZ_01" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">人像面</div>
             </div>
             <span class="slot" v-show="dataForm.SFZ_01">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.SFZ_01)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('SFZ_01')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.SFZ_01)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('SFZ_01')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
-              
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.SFZ_01)">
-            <img v-if="dataForm.SFZ_01" :src="dataForm.SFZ_01" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.SFZ_01)"
+          >
+            <img v-if="dataForm.SFZ_01" :src="dataForm.SFZ_01" class="avatar" />
           </div>
         </el-form-item>
         <el-form-item label="">
@@ -58,22 +74,39 @@
             :http-request="httpRequest"
             :before-upload="beforeAvatarUpload"
           >
-            <img v-if="dataForm.SFZ_02" :src="dataForm.SFZ_02" class="avatar"/>
+            <img v-if="dataForm.SFZ_02" :src="dataForm.SFZ_02" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">国徽面</div>
             </div>
             <span class="slot" v-show="dataForm.SFZ_02">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.SFZ_02)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('SFZ_02')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.SFZ_02)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('SFZ_02')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.SFZ_02)">
-            <img v-if="dataForm.SFZ_02" :src="dataForm.SFZ_02" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.SFZ_02)"
+          >
+            <img v-if="dataForm.SFZ_02" :src="dataForm.SFZ_02" class="avatar" />
           </div>
         </el-form-item>
       </div>
@@ -91,21 +124,38 @@
           >
             <img v-if="dataForm.Z6Z_00" :src="dataForm.Z6Z_00" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">上传资料</div>
             </div>
             <!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
             <span class="slot" v-show="dataForm.Z6Z_00">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.Z6Z_00)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('Z6Z_00')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.Z6Z_00)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('Z6Z_00')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.Z6Z_00)">
-            <img v-if="dataForm.Z6Z_00" :src="dataForm.Z6Z_00" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.Z6Z_00)"
+          >
+            <img v-if="dataForm.Z6Z_00" :src="dataForm.Z6Z_00" class="avatar" />
           </div>
         </el-form-item>
       </div>
@@ -119,24 +169,40 @@
             name="LD_00"
             :show-file-list="false"
             :http-request="httpRequest"
-            :before-upload="beforeAvatarUpload"
           >
             <img v-if="dataForm.LD_00" :src="dataForm.LD_00" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">上传资料</div>
             </div>
             <span class="slot" v-show="dataForm.LD_00">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.LD_00)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('LD_00')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.LD_00)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('LD_00')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.LD_00)">
-            <img v-if="dataForm.LD_00" :src="dataForm.LD_00" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.LD_00)"
+          >
+            <img v-if="dataForm.LD_00" :src="dataForm.LD_00" class="avatar" />
           </div>
         </el-form-item>
       </div>
@@ -152,22 +218,39 @@
             :http-request="httpRequest"
             :before-upload="beforeAvatarUpload"
           >
-            <img v-if="dataForm.YP_00" :src="dataForm.YP_00" class="avatar"/>
+            <img v-if="dataForm.YP_00" :src="dataForm.YP_00" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">上传资料</div>
             </div>
             <span class="slot" v-show="dataForm.YP_00">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.YP_00)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('YP_00')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.YP_00)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('YP_00')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.YP_00)">
-            <img v-if="dataForm.YP_00" :src="dataForm.YP_00" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.YP_00)"
+          >
+            <img v-if="dataForm.YP_00" :src="dataForm.YP_00" class="avatar" />
           </div>
         </el-form-item>
       </div>
@@ -186,20 +269,37 @@
             <img v-if="dataForm.DX_00" :src="dataForm.DX_00" class="avatar" />
             <div v-else class="upload-icon">
               <!-- <i class="el-icon-camera" style="font-size: 30px;"></i> -->
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">上传资料</div>
             </div>
             <span class="slot" v-show="dataForm.DX_00">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.DX_00)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('DX_00')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.DX_00)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('DX_00')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.DX_00)">
-            <img v-if="dataForm.DX_00" :src="dataForm.DX_00" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.DX_00)"
+          >
+            <img v-if="dataForm.DX_00" :src="dataForm.DX_00" class="avatar" />
           </div>
         </el-form-item>
       </div>
@@ -217,27 +317,43 @@
           >
             <img v-if="dataForm.LZ_01" :src="dataForm.LZ_01" class="avatar" />
             <div v-else class="upload-icon">
-              <img src="@/assets/image/people/camera.svg" alt="">
+              <img src="@/assets/image/people/camera.svg" alt="" />
               <div class="el-upload__text">上传资料</div>
             </div>
             <span class="slot" v-show="dataForm.LZ_01">
-              <i class="preview" @click.stop="handlePictureCardPreview(dataForm.LZ_01)"></i>
-              <img class="close" v-show="!isDisabled" src="@/assets/image/people/close.png" alt="" @click.stop="handlePictureCardDelete('LZ_01')">
+              <i
+                class="preview"
+                @click.stop="handlePictureCardPreview(dataForm.LZ_01)"
+              ></i>
+              <img
+                class="close"
+                v-show="!isDisabled"
+                src="@/assets/image/people/close.png"
+                alt=""
+                @click.stop="handlePictureCardDelete('LZ_01')"
+              />
               <div v-show="!isDisabled" class="bottomHandle">
-                <img class="reset" src="@/assets/image/people/reset.png" alt="">
+                <img
+                  class="reset"
+                  src="@/assets/image/people/reset.png"
+                  alt=""
+                />
                 <span class="title">点击重新上传</span>
               </div>
             </span>
           </el-upload>
-          <div class="avatar-uploader" v-else @click.stop="handlePictureCardPreview(dataForm.LZ_01)">
-            <img v-if="dataForm.LZ_01" :src="dataForm.LZ_01" class="avatar"/>
+          <div
+            class="avatar-uploader"
+            v-else
+            @click.stop="handlePictureCardPreview(dataForm.LZ_01)"
+          >
+            <img v-if="dataForm.LZ_01" :src="dataForm.LZ_01" class="avatar" />
           </div>
         </el-form-item>
       </div>
     </el-form>
 
-
-<!-- 
+    <!-- 
     <div class="imageLibraryItem">
       <el-row class="imageLibraryItemTitle">
         <label @click="pic1Control = !pic1Control"> 身份证照片 </label>
@@ -399,7 +515,12 @@
       </el-row>
     </div> -->
 
-    <el-image-viewer v-if="showViewer" :on-close="closeViewer" :z-index="9999" :url-list="[ProViewImg]" />
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :z-index="9999"
+      :url-list="[ProViewImg]"
+    />
   </div>
 </template>
 <script>
@@ -421,14 +542,14 @@ export default {
       },
     },
     //影像资料显示隐藏
-    dialogVisible:{
+    dialogVisible: {
       type: Boolean,
       default: () => {
         return false;
       },
     },
     //影像资料预览状态
-    carfrontImg:{
+    carfrontImg: {
       type: Boolean,
       default: () => {
         return false;
@@ -436,12 +557,12 @@ export default {
     },
     isDisabled: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   components: {
     "el-image-viewer": () =>
-      import("element-ui/packages/image/src/image-viewer")
+      import("element-ui/packages/image/src/image-viewer"),
   },
   data() {
     return {
@@ -455,41 +576,42 @@ export default {
       showViewer: false,
     };
   },
-  watch:{
-    dialogVisible(n,o){
-      this.pic1Control= o
-      this.pic3Control= o
-      this.pic4Control= o
-      this.pic5Control= o
-      this.pic6Control= o
-      this.pic7Control= o
-    }
-  },
-  created() {
+  watch: {
+    dialogVisible(n, o) {
+      this.pic1Control = o;
+      this.pic3Control = o;
+      this.pic4Control = o;
+      this.pic5Control = o;
+      this.pic6Control = o;
+      this.pic7Control = o;
+    },
   },
+  created() {},
   methods: {
     toItem(item) {
-      document.getElementById(item._props.name).scrollIntoView({ behavior: "smooth" });
+      document
+        .getElementById(item._props.name)
+        .scrollIntoView({ behavior: "smooth" });
     },
     // 删除
     handlePictureCardDelete(type) {
-      this.dataForm[type] = ''
+      this.dataForm[type] = "";
       //添加刪除图像集合中的数据
-      var img_index=-1;
+      var img_index = -1;
       this.imagesIdList.forEach((item, index) => {
-        if (item.type == type) {                    
-          img_index =index;                 
+        if (item.type == type) {
+          img_index = index;
         }
       });
-      if(img_index!=-1){
+      if (img_index != -1) {
         this.imagesIdList.splice(img_index, 1);
       }
     },
     //预览图片
     handlePictureCardPreview(img) {
-      if(!img){
-        this.$message.error('暂无照片')
-        return 
+      if (!img) {
+        this.$message.error("暂无照片");
+        return;
       }
       this.ProViewImg = img;
       this.showViewer = true;
@@ -501,7 +623,7 @@ export default {
     // 上传图片的方法Start
     beforeAvatarUpload(file) {
       if (this.isDisabled) {
-        return
+        return;
       }
       const isJPG = file.type === "image/jpeg" || file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -516,7 +638,7 @@ export default {
     //上传影像
     httpRequest(options) {
       if (this.isDisabled) {
-        return
+        return;
       }
       let file = options.file;
       let filename = options.filename;
@@ -531,19 +653,19 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          if (this.imagesIdList.some(v => v.type == filename)) {
-            this.imagesIdList.map(val => {
+          if (this.imagesIdList.some((v) => v.type == filename)) {
+            this.imagesIdList.map((val) => {
               if (val.type == filename) {
                 val.imageId = res.data.id;
               }
-            })
+            });
           } else {
             this.imagesIdList.push({
               imageId: res.data.id,
               type: filename,
-            })
+            });
           }
         }
       });
@@ -590,12 +712,13 @@ export default {
   margin-top: 7px;
   color: #999;
 }
-.el-upload--picture-card:hover, .el-upload:focus{
+.el-upload--picture-card:hover,
+.el-upload:focus {
   color: #333;
 }
 .upload-icon:hover {
   /* border: 1px dashed #2D4D89; */
-  border-color: #D42426;
+  border-color: #d42426;
   /* color: #D42426; */
   transition: all ease 1s;
 }
@@ -650,7 +773,7 @@ export default {
   align-items: center;
 }
 
-.close{
+.close {
   width: 12px;
   height: 12px;
   position: absolute;
@@ -658,30 +781,30 @@ export default {
   right: 0;
   cursor: pointer;
 }
-.preview{
+.preview {
   width: 208px;
   height: calc(130px - 24px);
 }
-.bottomHandle{
+.bottomHandle {
   width: 208px;
   height: 24px;
   line-height: 20px;
-  background: url('~@/assets/image/people/bottomFrame.png') no-repeat;
+  background: url("~@/assets/image/people/bottomFrame.png") no-repeat;
   position: absolute;
   bottom: 0;
   left: -1px;
   cursor: pointer;
 }
-.reset{
+.reset {
   width: 10px;
-  height: 10px
+  height: 10px;
 }
-.bottomHandle>.title{
+.bottomHandle > .title {
   font-size: 12px;
   color: #fff;
   padding: 0;
 }
-.slot>i {
+.slot > i {
   /* margin: 10px; */
   /* color: #fff; */
   /* font-size: 25px; */
@@ -691,7 +814,7 @@ export default {
 .slot:hover {
   opacity: 1;
 }
-.title{
+.title {
   font-size: 16px;
   color: #333;
   padding-bottom: 10px;
@@ -699,7 +822,6 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-
 </style>
 <style lang="scss" scoped>
 .contaner {
@@ -716,11 +838,11 @@ export default {
     padding: 0 !important;
     margin-right: 0 !important;
     max-height: 470px;
-    >>>.el-form-item{
+    >>> .el-form-item {
       margin-right: 20px;
       margin-bottom: 24px;
     }
-    >>>.el-form-item__content{
+    >>> .el-form-item__content {
       line-height: 0;
     }
   }

src/views/FinancialManagement/ContractManagement/ContractManagement.vue

@@ -137,6 +137,7 @@
       size="small"
       :data="tableData"
       style="width: 100%"
+      height="650"
       border
       :header-cell-style="{
         background: '#F2F7FC',
@@ -147,11 +148,9 @@
     >
       <el-table-column type="index" width="50" label="序号"> </el-table-column>
 
-      <el-table-column prop="contractCode" label="合同编码" width="180">
-      </el-table-column>
-      <el-table-column prop="contractName" label="合同名称" width="180">
-      </el-table-column>
-      <el-table-column prop="contractType" label="合同类型">
+      <el-table-column prop="contractCode" label="合同编码"> </el-table-column>
+      <el-table-column prop="contractName" label="合同名称"> </el-table-column>
+      <el-table-column prop="contractType" label="合同类型" width="230">
         <template slot-scope="scope">
           <div>
             {{
@@ -167,11 +166,11 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="externalCompaniesName" label="甲方">
+      <el-table-column prop="externalCompaniesName" label="甲方" width="230">
       </el-table-column>
-      <el-table-column prop="internalCompanyName" label="乙方">
+      <el-table-column prop="internalCompanyName" label="乙方" width="230">
       </el-table-column>
-      <el-table-column prop="supplierName" label="供应商名称">
+      <el-table-column prop="supplierName" label="供应商名称" width="230">
         <template slot-scope="scope">
           <div v-for="(item, index) in scope.row.namesimpleList" :key="index">
             {{ index < 3 ? item : "" }}
@@ -193,7 +192,7 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column prop="isOpenContract" label="是否为开口合同">
+      <el-table-column prop="isOpenContract" label="是否为开口合同" width="160">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.isOpenContract == '0' ? 'success' : 'danger'"
@@ -203,8 +202,10 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="effectiveDate" label="生效日期"> </el-table-column>
-      <el-table-column prop="expiringDate" label="失效日期"> </el-table-column>
+      <el-table-column prop="effectiveDate" label="生效日期" width="180">
+      </el-table-column>
+      <el-table-column prop="expiringDate" label="失效日期" width="180">
+      </el-table-column>
       <el-table-column prop="shouldPostponed" label="是否顺延">
         <template slot-scope="scope">
           <el-tag
@@ -215,7 +216,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="shouldPostponedDate" label="顺延时间">
+      <el-table-column prop="shouldPostponedDate" label="顺延时间" width="180">
       </el-table-column>
 
       <el-table-column
@@ -224,7 +225,7 @@
         width="180"
       >
       </el-table-column>
-      <el-table-column prop="operation" label="操作" width="180">
+      <el-table-column prop="operation" label="操作" width="180" fixed="right">
         <template slot-scope="scope">
           <kt-button
             size="small"
@@ -482,6 +483,7 @@
                   ? 'expiringDate'
                   : '1'
               "
+              @change="expiringDateChange"
             >
               <!-- {{ form.contractType }} -->
               <el-date-picker
@@ -1189,6 +1191,7 @@ export default {
         this.shoulDisabled = true;
       } else {
         this.shoulDisabled = false;
+        this.form.shouldPostponedEffectiveDate = "";
       }
       this.date = "";
       this.month = "";
@@ -1240,7 +1243,10 @@ export default {
           })
           .then((res) => {
             if (res.code === 200) {
-              this.showFileList = [...res.data.contractFileEntityList];
+              this.showFileList =
+                res.data.contractFileEntityList != null
+                  ? [...res.data.contractFileEntityList]
+                  : [];
               this.form = {
                 contractCode: res.data.contractCode,
                 contractType: res.data.contractType,
@@ -1422,6 +1428,7 @@ export default {
                 yearTime: this.date == "year" ? this.year : "",
                 monthTime: this.date == "month" ? this.month : "",
                 dayTime: this.date == "day" ? this.days : "",
+                dateType: this.date,
               })
               .then((res) => {
                 if (res.code === 200) {
@@ -1447,6 +1454,7 @@ export default {
                 yearTime: this.date == "year" ? this.year : "",
                 monthTime: this.date == "month" ? this.month : "",
                 dayTime: this.date == "day" ? this.days : "",
+                dateType: this.date,
               })
               .then((res) => {
                 if (res.code === 200) {
@@ -1543,21 +1551,34 @@ export default {
     },
 
     timeChange(type) {
-      let date = moment().format("YYYY-MM-DD HH:mm:ss");
       if (type == "year") {
-        this.form.shouldPostponedEffectiveDate = moment(date)
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
           .add(this[type], "year")
           .format("YYYY-MM-DD HH:mm:ss");
       } else if (type == "month") {
-        this.form.shouldPostponedEffectiveDate = moment(date)
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
           .add(this[type], "month")
           .format("YYYY-MM-DD HH:mm:ss");
       } else {
-        this.form.shouldPostponedEffectiveDate = moment(date)
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
           .add(this[type], "days")
           .format("YYYY-MM-DD HH:mm:ss");
       }
-      console.log();
+    },
+    expiringDateChange() {
+      if (this.type == "year") {
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
+          .add(this.year, "year")
+          .format("YYYY-MM-DD HH:mm:ss");
+      } else if (this.type == "month") {
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
+          .add(this.month, "month")
+          .format("YYYY-MM-DD HH:mm:ss");
+      } else {
+        this.form.shouldPostponedEffectiveDate = moment(this.form.expiringDate)
+          .add(this.days, "days")
+          .format("YYYY-MM-DD HH:mm:ss");
+      }
     },
     handleClose(done) {
       done();
@@ -1577,6 +1598,8 @@ export default {
       this.year = "";
       this.month = "";
       this.days = "";
+      this.date = "";
+
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
@@ -1621,6 +1644,10 @@ export default {
                     return v.fileId;
                   })
                 : [];
+            // this.year = res.data.yearTime;
+            // this.month = res.data.monthTime;
+            // this.day = res.data.dayTime;
+            // this.date = this.dateType;
           }
         });
     },

src/views/FinancialManagement/ContractManagement/ContractStatement.vue

@@ -20,25 +20,19 @@
         <el-col :span="6">
           <el-form-item label="供应商名称">
             <el-cascader
-              v-model="formInline.supplierIdList"
               :options="esmInsCompanyList"
               :props="{
                 checkStrictly: true,
+                multiple: true,
                 value: 'id',
                 label: 'name',
                 children: 'children',
               }"
-              filterable
               clearable
+              size="small"
+              v-model="formInline.supplierIdList"
+              filterable=""
             ></el-cascader>
-            <!-- <el-select
-                v-model="formInline.user"
-                placeholder="供应商名称"
-                size="small"
-                filterable
-              >
-                <el-option>全部</el-option>
-              </el-select> -->
           </el-form-item>
         </el-col>
 
@@ -252,6 +246,8 @@ export default {
         internalCompanyId: "",
         supplierIdList: [],
       },
+      base: process.env.BASE_URL,
+
       tableData: [],
       fileDialog: false,
 
@@ -311,14 +307,18 @@ export default {
         })
         .then((res) => {
           if (res.code === 200) {
-            this.showFileList = [...res.data.contractFileEntityList];
+            this.showFileList =
+              res.data.contractFileEntityList != null
+                ? [...res.data.contractFileEntityList]
+                : [];
             this.form = {
               contractCode: res.data.contractCode,
               contractType: res.data.contractType,
               // contractName: res.data.contractName,
               externalCompaniesId: res.data.externalCompaniesId,
               internalCompanyId: res.data.internalCompanyId,
-              supplierIdList: res.data.supplierIdList,
+              supplierIdList:
+                res.data.supplierIdList != null ? res.data.supplierIdList : [],
               // isOpenContract: res.data.isOpenContract,
               // effectiveDate: res.data.effectiveDate,
               // expiringDate: res.data.expiringDate,
@@ -342,12 +342,6 @@ export default {
                     return v.fileId;
                   })
                 : [];
-            if (commad == "supplement") {
-              this.dialogVisible = true;
-            }
-            if (commad == "watch") {
-              this.fileDialog = true;
-            }
           }
         });
     },
@@ -377,9 +371,14 @@ export default {
 
     //获取合同类型
     getContractType() {
+      this.contractTypeList = [];
       this.$api.contract.getContractType("contract_type").then((res) => {
         if (res.code === 200) {
-          this.contractTypeList = [...res.data];
+          res.data.map((v, i) => {
+            if (v.value == "1" || v.value == "2") {
+              this.contractTypeList.push(v);
+            }
+          });
         }
       });
     },