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

王震

2023-12-18 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a

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

@@ -134,10 +134,23 @@

      <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-form-item
            label="IFS库位"
            prop="ifsLocationDesc"
          >
          > -->
            <!-- <el-select
              v-model="dataForm.ifsLocation"
              filterable
@@ -152,13 +165,13 @@
              >
              </el-option>
            </el-select> -->
            <el-cascader
           <!--  <el-cascader
              v-model="dataForm.ifsLocationDesc"
              :props="locationProps"
              style="width:100%" filterable
            ></el-cascader>
          </el-form-item>
        </el-col>
        </el-col> -->
        <el-col :span="12">
          <el-form-item label="库位状态" prop="locStatus">
            <el-switch
@@ -169,7 +182,7 @@
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
      <!-- <el-row>
        <el-col :span="12">
          <el-form-item label="创建时间" prop="createTime">
            <el-date-picker
@@ -184,7 +197,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="12"> </el-col>
      </el-row>
      </el-row> -->
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>