Merge remote-tracking branch 'origin/master'

吴羡

2 天以前 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7

 src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue

@@ -3,7 +3,7 @@
    <div style="display: flex;justify-content: space-between">
      <div style="display: flex;">
        <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
          <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">物质名称</span>
          <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">物质名称</span>
          <el-input size="small" placeholder="请输入" clearable v-model="form.name"
                    @keyup.enter="getTableData"></el-input>
        </div>
@@ -48,7 +48,7 @@
      addRecordRef: false,
      columns: [
        {
          label: "出场编号",
          label: "出厂编号",
          prop: "factoryNum"
        },
        {
@@ -60,7 +60,7 @@
          prop: "factoryManufacturer"
        },
        {
          label: "文档编号",
          label: "档案编号",
          prop: "fileNum"
        },
        {
@@ -85,13 +85,17 @@
        // },
        {
          label: "提交日期",
          prop: "acquisitionDate"
          prop: "createTime"
        },
        {
          label: "数量",
          prop: "quantity"
        },
        {
          label: "单位",
          prop: "unit"
        },
        {
          fixed: "right",
          label: "操作",
          align: "center",