Merge remote-tracking branch 'origin/master'

hdy

2024-01-06 9c5ce6d05798da90d130ddf42d366fab369735e7

 jcdm-ui/src/views/main/bs/material/index.vue

@@ -83,41 +83,48 @@

    <el-table v-loading="loading" border :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.length > 0">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="物料编号" width="130" align="center" prop="materialCode">
      <el-table-column label="物料编号"  align="center" prop="materialCode" width="180">
      </el-table-column>
      <el-table-column label="物料名称" align="center" prop="materialName">
      <el-table-column label="物料名称" align="center" prop="materialName" width="250">
      </el-table-column>
      <el-table-column label="视图" align="center" prop="materialView">
      <el-table-column label="视图" align="center" prop="materialView" width="180">
      </el-table-column>
<!--      <el-table-column label="种类" align="center" prop="typeZ">-->
<!--      </el-table-column>-->
      <el-table-column label="类型" align="center" prop="typeL">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
        </template>
      </el-table-column>
      <el-table-column label="单位" align="center" prop="unit">

      <el-table-column label="型号" align="center" prop="typeZ" width="180">
      </el-table-column>

      <el-table-column label="单位" align="center" prop="unit" width="80">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="ERP规格" align="center" prop="erpSpec">-->
<!--      </el-table-column>-->
      <el-table-column label="数据来源" align="center" prop="dataSource">
      </el-table-column>
      <el-table-column label="状态" align="center" prop="status">

      <el-table-column label="状态" align="center" prop="status" width="80">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="厂商" align="center" prop="supplier">

<!--      <el-table-column label="厂商" align="center" prop="supplier">
      </el-table-column>-->
      <el-table-column label="备注" align="center" prop="remarks" width="180">
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remarks">
      <el-table-column label="创建人" align="center" prop="createUser" width="150">
      </el-table-column>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
        </template>
      <el-table-column label="创建时间" align="center" prop="createTime" width="170">
      </el-table-column>
      <el-table-column label="更新人" align="center" prop="updateUser" width="150">
      </el-table-column>
      <el-table-column label="更新时间" align="center" prop="updateTime" width="170">
      </el-table-column>
      <el-table-column label="数据来源" align="center" prop="dataSource">
      </el-table-column>
      <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -167,14 +174,8 @@
        <el-form-item label="物料名称" prop="materialName">
          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
        </el-form-item>
        <el-form-item label="视图" prop="materialView">
          <el-input v-model="form.materialView" placeholder="请输入视图" />
        </el-form-item>
<!--        <el-form-item label="种类" prop="typeZ">-->
<!--          <el-input v-model="form.typeZ" placeholder="请输入种类" />-->
<!--        </el-form-item>-->
        <el-form-item label="类型" prop="typeL">
<!--          <el-input v-model="form.typeL" placeholder="请输入类型" />-->
        <el-form-item label="物料类型" prop="typeL">
          <!--          <el-input v-model="form.typeL" placeholder="请输入类型" />-->
          <el-select v-model="form.typeL" style="width: 204px;" placeholder="请选择单位" clearable>
            <el-option
              v-for="dict in dict.type.material_type"
@@ -183,6 +184,12 @@
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="物料型号" prop="typeZ">
          <el-input v-model="form.typeZ" placeholder="请输入种类" />
        </el-form-item>
        <el-form-item label="视图" prop="materialView">
          <el-input v-model="form.materialView" placeholder="请输入视图" />
        </el-form-item>
        <el-form-item label="单位" prop="unit">
<!--          <el-input v-model="form.unit" placeholder="请输入单位" />-->
@@ -198,12 +205,12 @@
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="ERP规格" prop="erpSpec">
<!--        <el-form-item label="ERP规格" prop="erpSpec">
          <el-input v-model="form.erpSpec" placeholder="请输入ERP规格" />
        </el-form-item>
        <el-form-item label="厂商" prop="supplier">
        </el-form-item>-->
<!--        <el-form-item label="厂商" prop="supplier">
          <el-input v-model="form.supplier" placeholder="请输入厂商" />
        </el-form-item>
        </el-form-item>-->
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
@@ -286,9 +293,6 @@
        ],
        typeL: [
          { required: true, message: "类型不能为空", trigger: "blur" }
        ],
        unit: [
          { required: true, message: "单位不能为空", trigger: "blur" }
        ],
      }
    };