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

zouyu

2024-01-30 d267d7082d3a708e4b2b9f569250a3a588cb54ca

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

 src/views/product/producttraceability/index.vue

@@ -94,7 +94,7 @@
                      </div>
                    </el-col>
                  </el-row>
                </el-col>changePart
                </el-col>
                <el-col
                  :span="10"
                  :offset="1"

 src/views/quality/processconfiguration/index.vue

@@ -139,6 +139,15 @@
            // render: { fun: this.addOrUpdateHandle }
              }
          },
          // 检验编号
          {
            minWidth: '140',
            prop: 'inspectNo',
            label: '检验编号',
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
          },
          // 产品名称
          {
            minWidth: '140',
@@ -281,7 +290,7 @@
        }
      },
      materialType: [{label:'原材料检验',value:'原材料检验'},{label:'过程检验',value:'过程检验'},{label:'产品检验',value:'产品检验'},{label:'包装检验',value:'包装检验'}],
      StateList: [{label:'全部',value:''},{label:'已提交审核',value:'1'},{label:'待处理',value:'0'},{label:'已处理',value:'2'}],
      StateList: [{label:'全部',value:''},{label:'已提交审核',value:'1'},{label:'待处理',value:'0'}],
      insStateList: [{label:'其他',value:''},{label:'瑕疵',value:'1'}],
    }
  },

 src/views/quality/rawMaterial/index.vue

@@ -105,6 +105,17 @@
                    },
                    {
                        minWidth: '120',
                        prop: 'type',
                        label: '检验类型',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'select',
                        optList: () => {
                            return this.typeList
                        }
                    },
                    {
                        minWidth: '120',
                        prop: 'code',
                        label: '原材料编码',
                        isTrue: true,
@@ -225,6 +236,7 @@
            },
            insStateList: [{label:'全部',value:''},{label:'已检测',value:'1'},{label:'未检测',value:'0'}],
            StateList: [{label:'全部',value:''},{label:'已合格',value:'1'},{label:'不合格',value:'0'}],
            typeList: [{label:'全部',value:''},{label:'首检',value:'首检'},{label:'返检',value:'返检'}],
        }
    },
    components: {