Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

zouyu

2023-11-04 5cdff5e062935666b06848a3b63ae9b32d114146

 src/views/basic/location/location-form.vue

@@ -32,12 +32,28 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="父节点类型" prop="pType">
          <el-form-item label="所属仓库分组" prop="locGroup">
            <el-select
              v-model="dataForm.locGroup"
              filterable
              placeholder="请选择所属仓库分组"
              style="width:100%"
            >
              <el-option
                v-for="(item, index) in this.warehouseOptions"
                :label="item.warehouseName"
                :value="item.id"
                :key="index"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- <el-form-item label="父节点类型" prop="pType">
            <el-input
              v-model="dataForm.pType"
              placeholder="父节点类型"
            ></el-input>
          </el-form-item>
          </el-form-item> -->
        </el-col>
      </el-row>
      <el-row>
@@ -95,45 +111,47 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="库位地图" prop="locMap">
            <el-input
              v-model="dataForm.locMap"
              placeholder="库位地图"
            ></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="所属仓库分组" prop="locGroup">
            <el-select
              v-model="dataForm.locGroup"
              filterable
              placeholder="请选择所属仓库分组"
              style="width:100%"
            >
              <el-option
                v-for="(item, index) in this.warehouseOptions"
                :label="item.warehouseName"
                :value="item.id"
                :key="index"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="备注" prop="locRemark">
            <el-input
              v-model="dataForm.locRemark"
              placeholder="备注"
            ></el-input>
          </el-form-item>
          <!-- <el-form-item label="库位地图" prop="locMap">
            <el-input
              v-model="dataForm.locMap"
              placeholder="库位地图"
            ></el-input>
          </el-form-item> -->
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="库位状态" prop="locStatus">
            <el-switch
              v-model="dataForm.locStatus"
              :active-value="1"
              :inactive-value="0"
            ></el-switch>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="创建时间" prop="createTime">
            <el-date-picker
              readonly
              style="width: 100%"
              v-model="moment"
              type="datetime"
              placeholder="选择日期时间"
              value-format="yyyy-MM-dd HH:mm:ss"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
      </el-row>

      <el-row>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item
            v-if="permissions.basic_has_ifs"
            label="IFS库位"
@@ -153,36 +171,20 @@
              >
              </el-option>
            </el-select>-->
            <el-cascader
            <!-- <el-cascader
              v-model="dataForm.ifsLocationDesc"
              :props="locationProps"
              style="width:100%"
            ></el-cascader>
          </el-form-item>
        </el-col>
        </el-col> --> 
        <el-col :span="12">
          <el-form-item label="库位状态" prop="locStatus">
            <el-switch
              v-model="dataForm.locStatus"
              :active-value="1"
              :inactive-value="0"
            ></el-switch>
          </el-form-item>
          
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="创建时间" prop="createTime">
            <el-date-picker
              readonly
              style="width: 100%"
              v-model="moment"
              type="datetime"
              placeholder="选择日期时间"
              value-format="yyyy-MM-dd HH:mm:ss"
            >
            </el-date-picker>
          </el-form-item>

        </el-col>
        <el-col :span="12"> </el-col>
      </el-row>
@@ -223,6 +225,8 @@
      dataForm: {
        id: 0,
        factoryId: '',
        warehouseId: null,
        warehouseName: null,
        pType: '',
        locNo: '',
        locName: '',