有效期显示

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
+    <el-form class="formDataInfo" label-width="137px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
           <el-form-item label="DEMO">
@@ -73,6 +73,20 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8"
+                v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="证件合一">
             <el-select v-model="formData.CredentialFlag" placeholder="请选择" :disabled="!canUpdateSupplier"  @change="showorhid"  style="width: 100%">

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -3,7 +3,7 @@
     <!--startprint1-->
     <!--打印内容开始-->
     <el-form class="formDataInfo"
-             label-width="135px"
+             label-width="137px"
              ref="EntityForm"
              :model="formData"
              :rules="rulesform"
@@ -56,6 +56,7 @@
             </el-input>
           </el-form-item>
         </el-col>
+
         <el-col :span="8">
           <el-form-item label="供应商类型" prop="OperType">
             <el-select ref="OperType"
@@ -173,7 +174,20 @@
           </el-form-item>
         </el-col>
 
-
+        <el-col :span="8"
+                v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
 
         <el-col :span="8">
           <el-form-item label="证件类型">

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
+    <el-form class="formDataInfo" label-width="137px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
           <el-form-item label="DEMO">
@@ -75,6 +75,21 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8"
+                v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8">
            <el-form-item label="证件合一">
             <el-select v-model="formData.CredentialFlag" placeholder="请选择" :disabled="!canUpdateSupplier"  @change="showorhid" style="width: 100%">
@@ -84,9 +99,6 @@
           </el-form-item>
         </el-col>
 
-      </el-row>
-      <el-row>
-
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo" >
             <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!authUser || parseInt(authUser.Profile.IsCompanyUser) === 1 || (parseInt(authUser.Profile.IsCompanyUser) === 0 && parseInt(formData.Id) > 0)" placeholder="请输入" style="width: 100%">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -7,7 +7,7 @@
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 基建类已入库列表
+          <i class="icon icon-table2"></i> 基建类
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>物资类列表</el-breadcrumb-item>
+      <el-breadcrumb-item>物资类已入库列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 物资类已入库列表
+          <i class="icon icon-table2"></i> 物资类
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -7,7 +7,7 @@
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 服务类已入库列表
+          <i class="icon icon-table2"></i> 服务类
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">