前端: 目录管理中的外部市场和收入业务的企管法规处新增时直接为状态2(等同于审批通过)，通过不同页面调用区分是企管法规处(2)添加还是二级单位添加(申请 0,由流程控制最后变成2)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -119,7 +119,7 @@
               <el-input v-model="formData.Dept"  :maxlength="100" style="width: 100%" :readonly="!showBtn"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="formData.CatalogType != 7">
             <el-form-item label="有效期至" prop="ValidityTo" >
               <el-date-picker style="width: 100%" v-model="formData.ValidityTo" type="date" placeholder="有效期截止时间" :readonly="!showBtn"></el-date-picker>
             </el-form-item>
@@ -196,7 +196,7 @@
       }
       var checkCommercialNo = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入统一社会信用代码'))
+          callback()
         } else {
           let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.formData.USCCode)) {
@@ -273,7 +273,7 @@
           ],
           RegCapital: [
             { required: false, validator: checkMoney, trigger: 'change' },
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            // { type: 'number', message: '只能输入数字', trigger: 'blur' }
           ],
           RecordScope: [
             { required: true, message: '业务范围不能为空', trigger: 'blur' }
@@ -297,7 +297,7 @@
           FirstAudit: '',
           SecondAudit: '',
           ValidityFrom: null,
-          ValidityTo: null
+          ValidityTo: ''
         }
       }
     },
@@ -459,7 +459,7 @@
         this.formData.LegalPerson = val.LegalPerson
         this.formData.Address = val.Address
         this.formData.USCCode = val.USCCode
-        this.formData.RegCapital = val.RegCapital
+        this.formData.RegCapital = val.RegCapital === '' ? 0 : val.RegCapital
         this.formData.RecordScope = val.RecordScope
         this.formData.IDCode = val.IDCode
         this.formData.Business = val.Business
@@ -467,7 +467,7 @@
         this.formData.Dept = val.Dept
         this.formData.DutyDept = val.DutyDept
         this.formData.Status = val.Status
-        this.formData.ValidityTo = val.ValidityTo
+        this.formData.ValidityTo = val.ValidityTo === '0001-01-01T00:00:00Z' ? '' : val.ValidityTo
       },
       saveOilCataLog () {
         if (this.formData.Id > 0) {
@@ -479,6 +479,11 @@
       editEntity () {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
+            if (this.formData.CatalogType === 7) {
+              let now = new Date()
+              let year = now.getFullYear() + 4
+              this.formData.ValidityTo = year + '-12-31'
+            }
             api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
               if (res.data.code === 0) {
                 this.$message({
@@ -500,6 +505,9 @@
       addEntity () {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
+            if (this.formData.CatalogType === 6 || this.formData.CatalogType === 7) {
+              this.formData.Status = '2'
+            }
             api.addEntity(this.formData, this.$axios).then(res => {
               if (res.data.code === 0) {
                 this.$message({
@@ -550,12 +558,12 @@
         })
       },
       jsTimeHandleForInCome (val) {
-        if (this.formData.CatalogType == '7') {
-          // 收入业务无有效期，设置为当前时间的后五年
+        if (this.formData.CatalogType === 7) {
+          // 收入业务无有效期，设置为当前时间的后五年  后端存储后可不在此处理
           let now = new Date()
           let year = now.getFullYear() + 4
           return year + '-12-31'
-        } else if (this.formData.CatalogType == '6') {
+        } else if (this.formData.CatalogType === 6) {
           if (val === '') {
             return '----'
           } else if (val === '0001-01-01T08:00:00+08:00') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogselect/income.vue

@@ -366,7 +366,7 @@
       },
       jsTimeHandleForInCome (val) {
         if (this.formData.CatalogType == '7') {
-          // 收入业务无有效期，设置为当前时间的后五年
+          // 收入业务无有效期，设置为当前时间的后五年  后端存储后可不在此处理
           let now = new Date()
           let year = now.getFullYear() + 4
           return year + '-12-31'

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

@@ -186,7 +186,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="企业名称" prop="CompanyName">
-              <el-input v-model="incomeData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.CompanyName" :maxlength="255" placeholder="请输入企业名称" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -198,23 +198,23 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="法人身份证号" prop="IDCode">
-              <el-input v-model="incomeData.IDCode" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.IDCode" :maxlength="255" placeholder="请输入法人身份证号" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册地址" prop="Address">
-              <el-input v-model="incomeData.Address" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.Address" :maxlength="255" placeholder="请输入注册地址" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="全国统一信用代码" prop="USCCode">
-              <el-input v-model="incomeData.USCCode" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.USCCode" :maxlength="255" placeholder="请输入全国统一信用代码" style="width: 100%"></el-input>
             </el-form-item>
           </el-col><el-col :span="12">
           <el-form-item label="注册资金" prop="RegCapital">
-            <el-input type="number" v-model.number="incomeData.RegCapital" :min="1" placeholder="请输入" style="width: 100%">
+            <el-input type="number" v-model.number="incomeData.RegCapital" :min="1" placeholder="请输入注册资金" style="width: 100%">
               <template slot="append">万元</template>
             </el-input>
           </el-form-item>
@@ -223,12 +223,12 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="业务范围" prop="RecordScope">
-              <el-input v-model="incomeData.RecordScope"  type="textarea" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.RecordScope" placeholder="请输入业务范围" type="textarea" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="incomeData.Remark"  placeholder="请输入" type="textarea" style="width: 100%">
+              <el-input v-model="incomeData.Remark"  placeholder="请输入备注" type="textarea" style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
@@ -246,25 +246,25 @@
       <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">
-              <el-input v-model="incomeData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+            <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="ValidityTo">
-              <el-date-picker v-model="incomeData.ValidityTo" type="date" laceholder="有效期截止时间" style="width: 100%"></el-date-picker>
+              <el-date-picker v-model="incomeData.ValidityTo" type="date" placeholder="有效期截止时间" style="width: 100%"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="业务范围" prop="Business">
-              <el-input v-model="incomeData.Business"  type="textarea" style="width: 100%"></el-input>
+              <el-input v-model="incomeData.Business"  type="textarea" placeholder="请输入业务范围" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="incomeData.Remark"  placeholder="请输入" type="textarea" style="width: 100%">
+              <el-input v-model="incomeData.Remark"  placeholder="请输入备注" type="textarea" style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
@@ -624,10 +624,10 @@
         this.incomeData.Status = val.Status
         this.ValidityDate = [new Date(val.ValidityFrom), new Date(val.ValidityTo)]
         if (this.cardType === '6') {
-          this.marketTitle = '编辑外部市场目录'
+          this.marketTitle = this.formData.Status == '0' ? '编辑外部市场目录' : '查看外部市场目录'
           this.showAddMarketDialog = true
         } else {
-          this.dialogTitle = '编辑收入业务目录'
+          this.dialogTitle = this.formData.Status == '0' ? '编辑收入业务目录' : '查看收入业务目录'
           this.showAddDialog = true
         }
       },
@@ -736,6 +736,7 @@
         let _this = this
         _this.$refs['IncomeEntity'].validate((valid) => {
           if (valid) {
+            _this.incomeData.Status = '0'
             catapi.addEntity(_this.incomeData, _this.$axios).then(res => {
               if (res.data.code === 0) {
                 _this.$message({
@@ -804,6 +805,13 @@
       },
 
       saveEntity () {
+        if (this.formData.Dept === '') {
+          this.$message({
+            type: 'warning',
+            message: '申报单位不能为空'
+          })
+          return
+        }
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             this.formData.SecondAuditName = this.$refs.secondAudit.selectedLabel + ''