调整注册及准入细节

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

@@ -24,7 +24,7 @@
         </span>
         <span style="float: right;">
           <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
-          <el-popover>
+          <!--<el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
               <el-step title="待审批"></el-step>
@@ -39,9 +39,9 @@
             @click="annaudit">
             年审申请</el-button>
           <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
-          </el-button>
+          </el-button>-->
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
+          <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
           <!--<router-link :to="'/oilsupplier/supplier/basislist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
             <!--</el-button>-->
@@ -496,7 +496,7 @@
           Currency: 'CNY',
           ContactName: '',
           CompanyType: '',
-          SetupTime: null,
+          SetupTime: new Date(),
           DepositBank: '',
           BankAccount: '',
           EMail: '',

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

@@ -30,7 +30,7 @@
             style="margin-right: 5px"
             @click="nextTab"
           >下一步</el-button>-->
-          <el-popover>
+          <!--<el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
               <el-step title="待审批"></el-step>
@@ -45,9 +45,9 @@
             @click="annaudit">
             年审申请</el-button>
           <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
-          </el-button>
+          </el-button>-->
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
+          <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
           <!--<router-link :to="'/oilsupplier/supplier/goodslist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>-->
           <!--</router-link>-->
@@ -498,7 +498,7 @@
           Currency: "CNY",
           ContactName: "",
           CompanyType: "",
-          SetupTime: null,
+          SetupTime: new Date(),
           DepositBank: "",
           BankAccount: "",
           EMail: "",

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

@@ -24,7 +24,7 @@
         </span>
         <span style="float: right;">
           <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
-          <el-popover>
+          <!--<el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
               <el-step title="待审批"></el-step>
@@ -40,9 +40,9 @@
             @click="annaudit">
             年审申请</el-button>
           <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
-          </el-button>
+          </el-button>-->
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
+          <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
           <!--<router-link :to="'/oilsupplier/supplier/techlist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
             <!--</el-button>-->
@@ -491,7 +491,7 @@
           Currency: 'CNY',
           ContactName: '',
           CompanyType: '',
-          SetupTime: null,
+          SetupTime: new Date(),
           DepositBank: '',
           BankAccount: '',
           EMail: '',

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -107,6 +107,17 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="24">
+                  <el-form-item label="审核单位"  style="width: 100%">
+                    <el-select v-model="auditorg"  filterable placeholder="请选择审核单位"
+                               style="width: 100%;" @change="orgChange">
+                      <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                                 style="width: 100%">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="24">
                   <el-form-item label="用户名" label-width="150px" style="width: 100%" prop="UserName">
                     <el-input v-model="formData.UserName" placeholder="请输入登录用户名"></el-input>
@@ -114,12 +125,12 @@
                 </el-col>
 
 
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
                     <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-form-item label="确认密码"  style="width: 100%" prop="UserPass2" >
                     <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
                   </el-form-item>
@@ -131,16 +142,7 @@
                     <!--</el-input>-->
                   <!--</el-form-item>-->
                 <!--</el-col>-->
-                <el-col :span="8">
-                  <el-form-item label="审核单位"  style="width: 100%">
-                    <el-select v-model="auditorg"  filterable placeholder="请选择审核单位"
-                               style="width: 100%;" @change="orgChange">
-                      <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
-                                 style="width: 100%">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+
                 <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
                   </el-form-item>
                   <el-form-item label="短信验证码" prop="phober"  style="width: 100%">