时间修改

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

@@ -204,7 +204,7 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="成立时间">
+          <el-form-item label="成立时间" prop="SetupTime">
             <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
               style="width: 100%"> </el-date>-->
             <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier"
@@ -648,7 +648,11 @@
             validator: checkTelphone,
             trigger: 'blur'
           } ],
-
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
+          }],
           Fax: [{
             required: false,
             validator: checkFax,

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

@@ -78,6 +78,21 @@
       })
     },
     data () {
+      // 注册资金限制
+      var checkNumber = (rule, value, callback) => {
+        if (!value) {
+          if (value !== 0) {
+            return callback(new Error('数量不能为空'))
+          }
+        } else {
+          if (value < 0) {
+            callback(new Error('数量不能小于0'))
+          } else {
+            callback()
+          }
+        }
+      }
+
       return {
         SupplierId: '0',
         SupplierCertId: '0',
@@ -109,10 +124,11 @@
             message: '请输入规格型号',
             trigger: 'change'
           }],
-          Number: [
-            {required: true, message: '请输入数量'},
-            {type: 'number', message: '数量必须为数字值'}
-          ]
+          Number: [{
+            required: true,
+            validator: checkNumber,
+            trigger: 'change'
+          }]
         }
       }
     },

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

@@ -380,7 +380,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="成立时间">
+            <el-form-item label="成立时间" prop="SetupTime">
               <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
                 style="width: 100%"> </el-date>-->
               <el-date-picker v-model="formData.SetupTime"
@@ -969,12 +969,12 @@ export default {
         Grade: [{
           required: true,
           message: '请选择级别',
-          trigger: 'blur'
+          trigger: 'change'
         }],
         OperType: [{
           required: true,
           message: '请选择供应商类型',
-          trigger: 'blur'
+          trigger: 'change'
         }],
         Telphone: [{
           required: true,
@@ -1051,7 +1051,11 @@ export default {
           message: '请输入组织机构代码',
           trigger: 'change'
         }],
-
+        SetupTime: [{
+          required: true,
+          message: '请输入成立时间',
+          trigger: 'change'
+        }],
         RegCapital: [
           {required: true, validator: checkMoney, trigger: 'change'},
           { type: 'number', message: '只能输入数字', trigger: 'blur' }

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

@@ -113,7 +113,7 @@
           Name: '',
           Content: '',
           ApprovalAuthority: '',
-          ApprovalDate: new Date(),
+          ApprovalDate: null,
           Remark: ''
         },
         selfVisible: this.visible,
@@ -267,7 +267,7 @@
         this.PatentForm.Name = ''
         this.PatentForm.Content = ''
         this.PatentForm.ApprovalAuthority = ''
-        this.PatentForm.ApprovalDate = new Date()
+        this.PatentForm.ApprovalDate = null
         this.PatentForm.Remark = ''
         this.visible = true
       },

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

@@ -136,8 +136,8 @@
           ProjectName: '',
           BearContent: '',
           OwnerUnit: '',
-          StartTime: new Date(),
-          StopTime: new Date(),
+          StartTime: '',
+          StopTime: '',
           Tudge: '',
           Remark: ''
         },
@@ -313,8 +313,8 @@
         this.PerformanceForm.ProjectName = ''
         this.PerformanceForm.BearContent = ''
         this.PerformanceForm.OwnerUnit = ''
-        this.PerformanceForm.StartTime = new Date()
-        this.PerformanceForm.StopTime = new Date()
+        this.PerformanceForm.StartTime = null
+        this.PerformanceForm.StopTime = null
         this.PerformanceForm.Tudge = ''
         this.PerformanceForm.Remark = ''
         this.visible = true

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

@@ -213,7 +213,7 @@
         </el-col>-->
 
         <el-col :span="8">
-          <el-form-item label="成立时间">
+          <el-form-item label="成立时间" prop="SetupTime">
             <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
               style="width: 100%"> </el-date>-->
             <el-date-picker v-model="formData.SetupTime" :readonly="!canUpdateSupplier" type="date" format="yyyy 年 MM 月 dd 日"
@@ -611,7 +611,11 @@
             message: '请输入组织机构代码',
             trigger: 'change'
           } ],
-
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
+          }],
           // RegCapital: [{
           //   required: true,
           //   validator: checkMoney,

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

@@ -103,7 +103,7 @@
           AwardName: '',
           Authorities: '',
           OwnerUnit: '',
-          WinningTime: new Date(),
+          WinningTime: null,
           Remark: ''
         },
         selfVisible: this.visible,
@@ -251,7 +251,7 @@
         this.WinningForm.SupplierTypeCode = this.SupplierTypeCode
         this.WinningForm.AwardName = ''
         this.WinningForm.Authorities = ''
-        this.WinningForm.WinningTime = new Date()
+        this.WinningForm.WinningTime = null
         this.WinningForm.Remark = ''
         this.visible = true
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -263,7 +263,7 @@
             </el-col>
 
             <el-col :span="8">
-                <el-form-item label="成立时间">
+                <el-form-item label="成立时间" prop="SetupTime">
                   <el-date-picker v-model="formData.SetupTime" type="date"
                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
@@ -1152,6 +1152,11 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           Remark: ''
         },
         rulesform: {
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
+          }],
           Mobile: [{
             required: true,
             validator: checkMobile,
@@ -2642,7 +2647,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
-              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
+              // _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -315,7 +315,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                      <el-form-item label="成立时间">
+                      <el-form-item label="成立时间" prop="SetupTime">
                         <el-date-picker v-model="formData.SetupTime" :class="changedForm['SetupTime'] ? 'modified-form-input' : ''"
                                         type="date"
                                         format="yyyy 年 MM 月 dd 日"
@@ -1517,6 +1517,11 @@
             required: true,
             message: '用户名',
             trigger: 'blur'
+          }],
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
           }]
         },
         entrydetail: {
@@ -2752,7 +2757,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
-              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
+              // _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -208,7 +208,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="成立时间">
+                    <el-form-item label="成立时间" prop="SetupTime">
                       <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
                         style="width: 100%"> </el-date>-->
                       <el-date-picker v-model="formData.SetupTime" :class="changedForm['SetupTime'] ? 'modified-form-input' : ''"
@@ -1053,6 +1053,11 @@
           Remark: false
         },
         rulesform: {
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
+          }],
           Mobile: [{
             required: true,
             validator: checkMobile,
@@ -2478,7 +2483,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
-              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
+              // _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -251,7 +251,7 @@
               </el-col>
 
               <el-col :span="8">
-                <el-form-item label="成立时间">
+                <el-form-item label="成立时间" prop="SetupTime">
                   <el-date-picker v-model="formData.SetupTime" type="date"
                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
@@ -1209,6 +1209,11 @@
         butnab: false,
         MInfoId: '',
         rulesform: {
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
+          }],
           Mobile: [{
             required: true,
             validator: checkMobile,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -229,21 +229,21 @@
     <el-dialog :title="markettitle"
                :visible.sync="showaddmarketdialog"
                width="60%">
-      <el-form label-width="135px" ref="IncomeEntity" :model="incomeData" :disabled="incomeData.Status != 0">
+      <el-form label-width="135px" ref="IncomeEntity" :model="incomeData" :disabled="incomeData.Status != 0" :rules="rules1">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="供方名称" prop="CompanyName" :rules="{ required: true, message: '供方名称不能为空', trigger: 'blur'}">
+            <el-form-item label="供方名称" prop="CompanyName">
               <el-input v-model="incomeData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效期" prop="ValidityDate" >
+            <el-form-item label="有效期" prop="ValidityDate">
               <el-date-picker v-model="ValidityDate" type="daterange" range-separator="至"
                               start-placeholder="有效期起" end-placeholder="有效期止"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="营业范围" prop="Business" :rules="{ required: true, message: '营业范围不能为空', trigger: 'blur'}">
+            <el-form-item label="营业范围" prop="Business">
               <el-input v-model="incomeData.Business"  type="textarea" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
@@ -346,6 +346,7 @@
         }
       }
       var validDate = (rule, value, callback) => {
+        console.log(value)
         if (!value || !value[0] || !value[1]) {
           callback(new Error('请选择时间'))
         } else {
@@ -464,10 +465,12 @@
           ]
         },
         rules1: {
-          ValidityDate: [{
-            validator: validDate,
-            trigger: 'blur'
-          }]
+          CompanyName: [
+            { required: true, message: '供方名称不能为空', trigger: 'blur' }
+          ],
+          Business: [
+            { required: true, message: '营业范围不能为空', trigger: 'blur' }
+          ]
         }
       }
     },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -675,7 +675,7 @@ export default {
         Currency: 'CNY',
         ContactName: '',
         CompanyType: '',
-        SetupTime: new Date(),
+        SetupTime: null,
         DepositBank: '',
         BankAccount: '',
         EMail: '',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -684,7 +684,7 @@ export default {
         Currency: 'CNY',
         ContactName: '',
         CompanyType: '',
-        SetupTime: new Date(),
+        SetupTime: null,
         DepositBank: '',
         BankAccount: '',
         EMail: '',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -667,7 +667,7 @@ export default {
         Currency: 'CNY',
         ContactName: '',
         CompanyType: '',
-        SetupTime: new Date(),
+        SetupTime: null,
         DepositBank: '',
         BankAccount: '',
         EMail: '',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -211,7 +211,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="成立时间">
+                  <el-form-item label="成立时间" prop="SetupTime">
                     <el-date-picker v-model="supplierData.SetupTime" type="date"
                                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
@@ -1298,6 +1298,11 @@
             required: true,
             message: '用户名',
             trigger: 'blur'
+          }],
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
           }]
         },
         rules: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -277,7 +277,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="成立时间">
+                  <el-form-item label="成立时间" prop="SetupTime">
                     <el-date-picker v-model="supplierData.SetupTime" type="date"
                                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
@@ -1677,6 +1677,11 @@
             required: true,
             message: '用户名',
             trigger: 'blur'
+          }],
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
           }]
         },
         rules: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -211,7 +211,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="成立时间">
+                  <el-form-item label="成立时间" prop="SetupTime">
                     <el-date-picker v-model="supplierData.SetupTime" type="date"
                                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
@@ -1350,6 +1350,11 @@
             required: true,
             message: '用户名',
             trigger: 'blur'
+          }],
+          SetupTime: [{
+            required: true,
+            message: '请输入成立时间',
+            trigger: 'change'
           }]
         },
         supplierId: '',