lining 6 éve
szülő
commit
6dca0980fe

+ 56 - 56
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -153,65 +153,65 @@
           </el-row>
         </el-tab-pane>
 
-        <el-tab-pane label="顶级编码"
-                     name="2">
-          <el-form ref="form"
-                   :inline="true"
-                   style="float: left;margin-top:-7px">
-            <el-form-item label="">
-              <el-input size="mini"
-                        style="width: 245px;"
-                        v-model="keyword"
-                        placeholder="请输入名称或代码"></el-input>
-            </el-form-item>
-          </el-form>
-          <span style="float: left">
-            <el-button type="primary"
-                       size="mini"
-                       style="margin-left:10px;"
-                       @click="initData2019()">查询
-            </el-button>
-            <el-button type="primary"
-                       size="mini"
-                       style="margin-left:10px;"
-                       @click="goodsDialog = false">
-              取消</el-button>
-          </span>
+        <!--<el-tab-pane label="顶级编码"-->
+                     <!--name="2">-->
+          <!--<el-form ref="form"-->
+                   <!--:inline="true"-->
+                   <!--style="float: left;margin-top:-7px">-->
+            <!--<el-form-item label="">-->
+              <!--<el-input size="mini"-->
+                        <!--style="width: 245px;"-->
+                        <!--v-model="keyword"-->
+                        <!--placeholder="请输入名称或代码"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-form>-->
+          <!--<span style="float: left">-->
+            <!--<el-button type="primary"-->
+                       <!--size="mini"-->
+                       <!--style="margin-left:10px;"-->
+                       <!--@click="initData2019()">查询-->
+            <!--</el-button>-->
+            <!--<el-button type="primary"-->
+                       <!--size="mini"-->
+                       <!--style="margin-left:10px;"-->
+                       <!--@click="goodsDialog = false">-->
+              <!--取消</el-button>-->
+          <!--</span>-->
 
-          <el-table :data="goodsList2019"
-                    border
-                    size="mini"
-                    @selection-change="handleSelectionChangeCert">
-            <el-table-column type="selection"
-                             width="55">
-            </el-table-column>
-            <el-table-column prop="Code"
-                             label="编码"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="Name"
-                             label="名称"
-                             show-overflow-tooltip></el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChangeCert"
-                         @current-change="handleCurrentChangeCert"
-                         :current-page="currentPageCert"
-                         :page-sizes="[10, 15, 20, 25]"
-                         :page-size="sizeCert"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="currentItemCountCert">
-          </el-pagination>
-          <el-form label-width="80px"
-                   label-position="top">
-            <el-form-item label="备注信息">
-              <el-input size="mini"
-                        type="textarea"
-                        style="width:100%"
-                        v-model="Remark1"></el-input>
-            </el-form-item>
+          <!--<el-table :data="goodsList2019"-->
+                    <!--border-->
+                    <!--size="mini"-->
+                    <!--@selection-change="handleSelectionChangeCert">-->
+            <!--<el-table-column type="selection"-->
+                             <!--width="55">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column prop="Code"-->
+                             <!--label="编码"-->
+                             <!--show-overflow-tooltip></el-table-column>-->
+            <!--<el-table-column prop="Name"-->
+                             <!--label="名称"-->
+                             <!--show-overflow-tooltip></el-table-column>-->
+          <!--</el-table>-->
+          <!--<el-pagination @size-change="handleSizeChangeCert"-->
+                         <!--@current-change="handleCurrentChangeCert"-->
+                         <!--:current-page="currentPageCert"-->
+                         <!--:page-sizes="[10, 15, 20, 25]"-->
+                         <!--:page-size="sizeCert"-->
+                         <!--layout="total, sizes, prev, pager, next, jumper"-->
+                         <!--:total="currentItemCountCert">-->
+          <!--</el-pagination>-->
+          <!--<el-form label-width="80px"-->
+                   <!--label-position="top">-->
+            <!--<el-form-item label="备注信息">-->
+              <!--<el-input size="mini"-->
+                        <!--type="textarea"-->
+                        <!--style="width:100%"-->
+                        <!--v-model="Remark1"></el-input>-->
+            <!--</el-form-item>-->
 
-          </el-form>
+          <!--</el-form>-->
 
-        </el-tab-pane>
+        <!--</el-tab-pane>-->
       </el-tabs>
       <div slot="footer"
            class="dialog-footer"

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

@@ -124,9 +124,9 @@
                 <el-button style="float: right; padding: 3px 0" type="text"
                            v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData1()">添加</el-button>
               </div>
-              <el-table :data="myentityList"                 
+              <el-table :data="myentityList"
                         v-loading="tableloading"
-                        element-loading-text="正在更改请稍后..." 
+                        element-loading-text="正在更改请稍后..."
                         size="mini" border style="width: 100%;"  height="calc(100vh - 428px)" @sort-change="orderby">
                 <el-table-column label="操作" min-width="100" align="center" fixed>
                   <template slot-scope="scope">
@@ -329,65 +329,65 @@
           <!--</span>-->
         </el-tab-pane>
 
-        <el-tab-pane label="顶级编码" v-loading="loading"
-                     name="2">
-          <el-form ref="form"
-                   :inline="true"
-                   style="float: left;margin-top:-7px">
-            <el-form-item label="">
-              <el-input size="mini"
-                        style="width: 245px;"
-                        v-model="keyword"
-                        placeholder="请输入名称或代码"></el-input>
-            </el-form-item>
-          </el-form>
-          <span style="float: left">
-            <el-button type="primary"
-                       size="mini"
-                       style="margin-left:10px;"
-                       @click="initData2019()">查询
-            </el-button>
-            <el-button type="primary"
-                       size="mini"
-                       style="margin-left:10px;"
-                       @click="goodsDialog = false">
-              取消</el-button>
-          </span>
+        <!--<el-tab-pane label="顶级编码" v-loading="loading"-->
+                     <!--name="2">-->
+          <!--<el-form ref="form"-->
+                   <!--:inline="true"-->
+                   <!--style="float: left;margin-top:-7px">-->
+            <!--<el-form-item label="">-->
+              <!--<el-input size="mini"-->
+                        <!--style="width: 245px;"-->
+                        <!--v-model="keyword"-->
+                        <!--placeholder="请输入名称或代码"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-form>-->
+          <!--<span style="float: left">-->
+            <!--<el-button type="primary"-->
+                       <!--size="mini"-->
+                       <!--style="margin-left:10px;"-->
+                       <!--@click="initData2019()">查询-->
+            <!--</el-button>-->
+            <!--<el-button type="primary"-->
+                       <!--size="mini"-->
+                       <!--style="margin-left:10px;"-->
+                       <!--@click="goodsDialog = false">-->
+              <!--取消</el-button>-->
+          <!--</span>-->
 
-          <el-table :data="goodsList2019"
-                    border
-                    size="mini"
-                    @selection-change="handleSelectionChangeCert">
-            <el-table-column type="selection"
-                             width="55">
-            </el-table-column>
-            <el-table-column prop="Code"
-                             label="编码"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="Name"
-                             label="名称"
-                             show-overflow-tooltip></el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChangeCert"
-                         @current-change="handleCurrentChangeCert"
-                         :current-page="currentPageCert"
-                         :page-sizes="[10, 15, 20, 25]"
-                         :page-size="sizeCert"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="currentItemCountCert">
-          </el-pagination>
-          <el-form label-width="80px"
-                   label-position="top">
-            <el-form-item label="备注信息">
-              <el-input size="mini"
-                        type="textarea"
-                        style="width:100%"
-                        v-model="Remark1"></el-input>
-            </el-form-item>
+          <!--<el-table :data="goodsList2019"-->
+                    <!--border-->
+                    <!--size="mini"-->
+                    <!--@selection-change="handleSelectionChangeCert">-->
+            <!--<el-table-column type="selection"-->
+                             <!--width="55">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column prop="Code"-->
+                             <!--label="编码"-->
+                             <!--show-overflow-tooltip></el-table-column>-->
+            <!--<el-table-column prop="Name"-->
+                             <!--label="名称"-->
+                             <!--show-overflow-tooltip></el-table-column>-->
+          <!--</el-table>-->
+          <!--<el-pagination @size-change="handleSizeChangeCert"-->
+                         <!--@current-change="handleCurrentChangeCert"-->
+                         <!--:current-page="currentPageCert"-->
+                         <!--:page-sizes="[10, 15, 20, 25]"-->
+                         <!--:page-size="sizeCert"-->
+                         <!--layout="total, sizes, prev, pager, next, jumper"-->
+                         <!--:total="currentItemCountCert">-->
+          <!--</el-pagination>-->
+          <!--<el-form label-width="80px"-->
+                   <!--label-position="top">-->
+            <!--<el-form-item label="备注信息">-->
+              <!--<el-input size="mini"-->
+                        <!--type="textarea"-->
+                        <!--style="width:100%"-->
+                        <!--v-model="Remark1"></el-input>-->
+            <!--</el-form-item>-->
 
-          </el-form>
+          <!--</el-form>-->
 
-        </el-tab-pane>
+        <!--</el-tab-pane>-->
       </el-tabs>
       <div slot="footer"
            class="dialog-footer"