前:目录申请分两个页面

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

@@ -42,12 +42,12 @@
           <!--</el-col>-->
           <el-col :span="8">
             <el-form-item label="类型">
-              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable
-                          default-first-option :disabled="formData.Status > 0 || formData.Id > 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="formData.Status > 0 || formData.Id > 0" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable-->
+<!--                          default-first-option :disabled="formData.Status > 0 || formData.Id > 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="8">
@@ -595,7 +595,7 @@
           this.$message({
                     duration: 10000,
                     type: 'warning',
-            message: '没有录入收入业务目录，不允许提交'
+            message: '请先添加明细!'
           })
           return
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/index.vue

@@ -30,27 +30,21 @@
             </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;">添加申请</el-button>
+            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit?type=7'">
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加收入业务申请</el-button>
+            </router-link>
+            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit?type=6'">
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加外部市场申请</el-button>
             </router-link>
           </el-form-item>
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" size="mini" @sort-change="orderby" v-loading="tableLoading">
-        <el-table-column label="操作" align="center" fixed="right">
+        <el-table-column label="操作" align="center" fixed="right" width="150">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/oilcatalogsub/' + scope.row.Id + '/incomeedit'">
+            <router-link :to="'/oilsupplier/oilcatalogsub/' + scope.row.Id + '/incomeedit?type=' + scope.row.Type">
               <el-button type="primary" plain title="打开" size="mini">打开</el-button>
             </router-link>
-            <!--<el-popover placement="top" title="提示">-->
-              <!--<el-alert title="" description="确认要删除吗？" type="warning" :closable="false">-->
-              <!--</el-alert>-->
-              <!--<br/>-->
-              <!--<div style="text-align: right; margin: 0">-->
-                <!--<el-button type="danger" size="mini" @click="deleteEntityanditems(scope.row)">删除</el-button>-->
-              <!--</div>-->
-              <!---->
-            <!--</el-popover>-->
             <el-button slot="reference" type="danger" plain title="删除" style="margin-left:10px" size="mini"
                        :disabled="scope.row.Status > 0" @click="deleteEntityanditems(scope.row)">删除</el-button>
           </template>