src/views/equipment/mouldrecord/index.vue

@@ -51,14 +51,29 @@
              column: [
                {
                  minWidth: '140',
                  prop: 'packageNo',
                  prop: 'mouldCode',
                  label: '模具编码',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },{
                  minWidth: '140',
                  prop: 'mouldName',
                  label: '模具名称',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'productNo',
                  label: '报工单号',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },{
                  minWidth: '140',
                  prop: 'outBatchNo',
                  prop: 'batchNo',
                  label: '批号',
                  isTrue: true,
                  isSearch: true,
@@ -66,7 +81,7 @@
                },
                {
                  minWidth: '140',
                  prop: 'partNo',
                  prop: 'optaskNo',
                  label: '工单编号',
                  isTrue: true,
                  isSearch: true,
@@ -74,7 +89,7 @@
                },
                {
                  minWidth: '140',
                  prop: 'partName',
                  prop: 'workstationName',
                  label: '工作站名称',
                  isTrue: true,
                  isSearch: true,
@@ -82,7 +97,7 @@
                },
                {
                  minWidth: '140',
                  prop: 'specs',
                  prop: 'staffNo',
                  label: '使用人编号',
                  isTrue: true,
                  isSearch: true,

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -340,8 +340,8 @@
                <el-table-column prop="userName" label="检验员"></el-table-column>
                <el-table-column prop="judgeState" label="检验结论">
                  <template slot-scope="scope">
                    <el-tag type="success" v-if="scope.row.testState == '1'">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == '0'">不合格</el-tag>
                    <el-tag type="success" v-if="scope.row.testState == 1">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == 0">不合格</el-tag>
                  </template>
                </el-table-column>
                <el-table-column  label="操作">