Explorar el Código

前:样式;目录申请分两个申请

dubch hace 5 años
padre
commit
87e9488283

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -99,7 +99,7 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="120" label="年审到期日期" align="center"
+          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyTime+'') }}

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -99,7 +99,7 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="120" label="年审到期日期" align="center"
+          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyTime+'') }}

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -99,7 +99,7 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="120" label="年审到期日期" align="center"
+          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyTime+'') }}

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -98,7 +98,7 @@
           </el-table-column>
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-          <el-table-column prop="ApplyTime" sortable width="120" label="年审到期日期" align="center"
+          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyTime+'') }}

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -38,8 +38,8 @@
             </el-dropdown>
           </el-form-item>
           <el-form-item>
-            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit'">
-              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">申请</el-button>
+            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit?type='+formData.CatalogType">
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7' || formData.CatalogType == '6'">申请</el-button>
             </router-link>
             &nbsp;
             <el-button type="primary" size="mini" @click="addOilcatalog" v-if="showBtn">添加</el-button>

+ 15 - 6
src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -40,12 +40,13 @@
             <!--</el-form-item>-->
           <!--</el-col>-->
           <el-col :span="6">
-            <el-form-item label="类型" prop="Type" :rules="{ required: true, message: '类型不能为空', trigger: 'change'}">
-              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable
-                          default-first-option :disabled="formData.Status > 0">
-                <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">
-                </el-option>
-              </el-select>
+            <el-form-item label="类型">
+<!--              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable-->
+<!--                          default-first-option :disabled="formData.Status > 0">-->
+<!--                <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+              <el-input v-model="formDataType" :readonly="true" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -367,6 +368,7 @@
       }
 
       return {
+        formDataType: '',
         firOptions: [],
         showaddmarketdialog: false,
         dialogMakeSure: false,
@@ -488,6 +490,13 @@
       }
     },
     created () {
+      this.formData.Type = this.$route.query.type
+      if (this.$route.query.type == 6) {
+        this.formDataType = '外部市场'
+      } else {
+        this.formDataType = '收入业务'
+      }
+      console.log(this.$route.query.type, 'params.opera')
       Object.assign(this.incomeDataTmp, this.incomeData)
       this.formData.SubmitterId = this.authUser.Profile.Id
       this.formData.Submitter = this.authUser.Profile.Realname