2
3
yuedefeng преди 5 години
родител
ревизия
0b75eaa13e

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

@@ -21,7 +21,7 @@
                      type="text"
                      @click="setManufacturer(1)"
                      >设置非制造商</el-button> -->
-                     
+
         </span>
       </div>
       <el-table :data="goodsList"
@@ -140,41 +140,63 @@
                          size="mini"></el-switch>
             </el-col>
           </el-row>
-          <el-row :gutter="20"
-                  style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
-            <el-col :span="20">
-              <el-tree v-show="!switchstatus"
-                       highlight-current
-                       :expand-on-click-node="true"
-                       node-key="CodeName"
-                       :data="orgtreelist"
-                       :props="orgtreeprops"
-                       ref="orgmanagetree"
-                       check-on-click-node
-                       show-checkbox
-                       lazy
-                       :load="getChildrens"
-                       :filter-node-method="filterNode">
-              </el-tree>
-              <el-tree v-show="switchstatus"
-                       ref="secmanagetree"
-                       :data="sectreelist"
-                       show-checkbox
-                       check-on-click-node
-                       node-key="CodeName"
-                       :props="sectreeprops">
-              </el-tree>
+          <el-row>
+            <el-col :span="12">
+              <el-row :gutter="20"
+                      style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
+                <el-col :span="20">
+                  <el-tree v-show="!switchstatus"
+                           highlight-current
+                           :expand-on-click-node="true"
+                           node-key="CodeName"
+                           :data="orgtreelist"
+                           :props="orgtreeprops"
+                           ref="orgmanagetree"
+                           check-on-click-node
+                           show-checkbox
+                           lazy
+                           :load="getChildrens"
+                           :filter-node-method="filterNode">
+                  </el-tree>
+                  <el-tree v-show="switchstatus"
+                           ref="secmanagetree"
+                           :data="sectreelist"
+                           show-checkbox
+                           check-on-click-node
+                           node-key="CodeName"
+                           :props="sectreeprops">
+                  </el-tree>
+                </el-col>
+              </el-row>
+              <el-row style="margin-top: 30px">
+                备注信息:
+                <el-col :span="24">
+                  <el-input v-model="Remark"
+                            type="textarea"
+                            :rows=3
+                            placeholder="请输入备注信息"></el-input>
+                </el-col>
+              </el-row>
             </el-col>
-          </el-row>
-          <el-row style="margin-top: 30px">
-            备注信息:
-            <el-col :span="24">
-              <el-input v-model="Remark"
-                        type="textarea"
-                        :rows=3
-                        placeholder="请输入备注信息"></el-input>
+            <el-col :span="12">
+              <el-table
+                :data="tableData"
+                border
+                size="mini"
+                style="width: 100%">
+                <el-table-column
+                  prop="name"
+                  label="准入编码">
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="缺少的资质">
+                </el-table-column>
+              </el-table>
             </el-col>
           </el-row>
+
+
         </el-tab-pane>
 
         <!--<el-tab-pane label="顶级编码"-->
@@ -347,7 +369,20 @@ export default {
       flagId: 0, // 标记是否第一次点击
       isFirstOpen: true,
       node_had: {},
-      resolve_had: {}
+      resolve_had: {},
+      tableData: [{
+        name: '06010101普通合页',
+        address: '生产许可证'
+      }, {
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }]
     }
   },
   methods: {

+ 139 - 33
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -136,50 +136,140 @@
                          size="mini"></el-switch>
             </el-col>
           </el-row>
-          <el-row :gutter="20"
-                  style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
-            <el-col :span="20">
-              <el-tree v-show="!switchstatus"
-                       highlight-current
-                       :expand-on-click-node="true"
-                       node-key="CodeName"
-                       :data="orgtreelist"
-                       :props="orgtreeprops"
-                       ref="orgmanagetree"
-                       check-on-click-node
-                       show-checkbox
-                       lazy
-                       :load="getChildrens"
-                       :filter-node-method="filterNode">
-              </el-tree>
-              <el-tree v-show="switchstatus"
-                       ref="secmanagetree"
-                       :data="sectreelist"
-                       show-checkbox
-                       check-on-click-node
-                       node-key="CodeName"
-                       :props="sectreeprops">
-              </el-tree>
+          <el-row :gutter="15">
+            <el-col :span="14">
+              <el-row :gutter="20" style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
+                <el-col :span="20">
+                  <el-tree v-show="!switchstatus"
+                           highlight-current
+                           :expand-on-click-node="true"
+                           node-key="CodeName"
+                           :data="orgtreelist"
+                           :props="orgtreeprops"
+                           ref="orgmanagetree"
+                           check-on-click-node
+                           show-checkbox
+                           lazy
+                           :load="getChildrens"
+                           :filter-node-method="filterNode">
+                  </el-tree>
+                  <el-tree v-show="switchstatus"
+                           ref="secmanagetree"
+                           :data="sectreelist"
+                           show-checkbox
+                           check-on-click-node
+                           node-key="CodeName"
+                           :props="sectreeprops">
+                  </el-tree>
+                </el-col>
+              </el-row>
+              <el-row style="margin-top: 30px">
+                备注信息:
+                <el-col :span="24">
+                  <el-input v-model="Remark"
+                            type="textarea"
+                            :rows=3
+                            placeholder="请输入备注信息"></el-input>
+                </el-col>
+              </el-row>
             </el-col>
-          </el-row>
-          <el-row style="margin-top: 30px">
-            备注信息:
-            <el-col :span="24">
-              <el-input v-model="Remark"
-                        type="textarea"
-                        :rows=3
-                        placeholder="请输入备注信息"></el-input>
+            <el-col :span="10">
+              <el-table
+                row-class-name="warning-row"
+                :data="tableData"
+                border
+                size="mini"
+                style="width: 100%; margin-top:20px">
+                <el-table-column
+                  prop="name"
+                  label="准入编码">
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="缺少资质">
+                </el-table-column>
+              </el-table>
             </el-col>
           </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-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-tab-pane>-->
       </el-tabs>
       <div slot="footer"
            class="dialog-footer"
            v-if="tabIdx==1">
+        <!--<el-button size="mini" @click="visible = false">取 消</el-button>-->
         <el-button type="primary"
                    size="mini"
                    @click="getChecklist()">确 定</el-button>
       </div>
+      <!--<div slot="footer"-->
+      <!--class="dialog-footer"-->
+      <!--v-if="tabIdx==2">-->
+      <!--<el-button type="primary"-->
+      <!--size="mini"-->
+      <!--@click="addBusiness1()">确 定</el-button>-->
+      <!--</div>-->
     </el-dialog>
   </div>
 </template>
@@ -277,7 +367,20 @@
         flagId: 0, // 标记是否第一次点击
         isFirstOpen: true,
         node_had: {},
-        resolve_had: {}
+        resolve_had: {},
+        tableData: [{
+          name: '06010101普通合页',
+          address: '生产许可证'
+        }, {
+          name: '06010101普通合页',
+          address: '营业执照'
+        }, {
+          name: '06010101普通合页',
+          address: '企业信用信息截屏'
+        }, {
+          name: '06010101普通合页',
+          address: '银行开户许可证'
+        }]
       }
     },
     methods: {
@@ -702,4 +805,7 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+  .el-table .warning-row {
+    background: oldlace;
+  }
 </style>