仓库修改

src/views/basicdata/dept/index.vue

@@ -105,13 +105,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否为库位" prop="fLocation ">
-              <el-select v-model="form.fLocation">
+            <el-form-item label="是否为库位" prop="fLocation " label-width="82px">
+              <el-select v-model="form.fLocation" style="width:100%">
                 <el-option label="是" value="1" />
                 <el-option label="否" value="0" />
               </el-select>
             </el-form-item>
            </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
@@ -150,7 +152,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="库容(吨)" prop="fTotalgross" >
+            <el-form-item v-if="form.fLocation === '1'" label="库容(吨)" prop="fTotalgross" >
               <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）"/>
             </el-form-item>
           </el-col>

src/views/warehouseBusiness/inStock/index.vue

@@ -1138,6 +1138,7 @@
                 label="*库区"
               >
                 <template slot-scope="scope">
+                  <div style="width: 100px;background-color: #1c84c6;height: 100px">1111{{dataList[0].fWarehouselocid}}</div>
                   <el-input
                     placeholder="请选择"
                     v-model="scope.row.fWarehouselocid"
@@ -2875,7 +2876,6 @@
       width="30%"
       :before-close="hanDleclose">
       <treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions" :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
-
       <span slot="footer" class="dialog-footer">
     <el-button @click="choiceWarehouse = false">取 消</el-button>
     <el-button type="primary" @click="confirm">确 定</el-button>
@@ -3272,7 +3272,7 @@ export default {
       console.log(key, keyPath);
     },
     /** 查询部门下拉树结构 */
-    getTreeselect(vaue) {
+    getTreeselect() {
       this.choiceWarehouse = true
       treeselect(this.form.fWarehouseid).then(response => {
         console.log(response)
@@ -3283,24 +3283,13 @@ export default {
       })
     },
     getAlltree(tree){
-      console.log(tree)
-      // treeselect(this.form.fWarehouseid).then(response => {
-      //   console.log(response)
-      //   console.log(this.fWarehouseidOptions)
-      //   for (let li in response.data) {
-      //     console.log(response.data[li])
-      //     //在根节点找到对应选项
-      //     if (!lable && response.data[li].label == tree) {
-      //       this.defaultTitle = response.data[li].label
-      //     }else if(){
-      //
-      //     }
-      //   }
-      // })
+      console.log(tree.fWarehouseInformation)
+      this.dataList[0].fWarehouseid = tree.fWarehouseInformation
+      console.log(this.dataList[0])
     },
     confirm(){
       this.choiceWarehouse = false
-
+      // console.log(this.dataList[0].fWarehouseid)
     },
     // 出库件数的计算
     qtyChange(row) {