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

zouyu

2023-11-02 778910ce85e301e63a43439b655cc457a96bbb44

 src/views/quality/processconfiguration/index.vue

@@ -36,13 +36,20 @@
                      <el-radio label="接收">接收</el-radio>
                    </el-radio-group>
                </div>
                <div v-if="type === '产品检验' || '过程检验'">
                <div v-if="type === '产品检验' ">
                    <el-radio-group v-model="checkList">
                      <el-radio label="返修">返修</el-radio>
                      <el-radio label="接收">接收</el-radio>
                      <el-radio label="降级使用">降级使用</el-radio> 
                      <el-radio label="报废">报废</el-radio> 

                    </el-radio-group>
                </div>
                <div v-if="type ===  '过程检验'">
                    <el-radio-group v-model="checkList">
                      <el-radio label="返修">返修</el-radio>
                      <el-radio label="接收">接收</el-radio>
                      <el-radio label="降级使用">降级使用</el-radio> 
                      <el-radio label="报废">报废</el-radio> 
                    </el-radio-group>
                </div>
            </el-form>
@@ -69,7 +76,7 @@
      // WayIdea:'',
      UserId:{},
      type:'',
      ajaxFun: UnqualifiedList,
      ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
      addOrUpdateVisible: false,
      multipleSelection: [],
      typeOptions: [],
@@ -317,6 +324,7 @@
  },
  computed: {
    ...mapGetters(['permissions'])

  },
  created() {
    // this.getType()
@@ -324,24 +332,17 @@
  methods: {
    //审核结果
    AuditResult(row){
      console.log(row);
      this.UserId = row.id
      this.type = row.type
      this.dialogVisible = true;
      console.log(row.type);
      // setTimeout(() => {
         //       if (this.type === 原材料检验) {
         //          return 
         //       } else 
      //     if (this.type === 产品检验) {
         //       }
         //    }, 100)

    },
    WaySure(){
      AuditSuggestion({id:this.UserId,way:this.checkList}).then(
        res =>{
          this.checkList = null
          this.WayIdea = null
          this.$refs.processconfiguration.refreshData()
          ;})
      this.dialogVisible = false
    },
@@ -350,6 +351,7 @@
      console.log(row.id);
       pullInsUnapi({id:row.id}).then(res =>{
        console.log(res);
        this.$refs.processconfiguration.refreshData()
       })
    },
   
@@ -375,23 +377,9 @@
            return "<span style='color:#34BD66;'></span>"
        }
    }, 
    // materialTypeList(row, column, cellValue){
    //         if(cellValue != undefined || cellValue != null){
    //             if(cellValue == 原材料检验){
    //                 return "<span style='color:#E84738;'>原材料检验</span>"
    //             }
    //             if(cellValue == 过程检验){
    //               return "<span style='color:#34BD66;'>过程检验</span>"
    //             }
    //             if(cellValue == 质量检验){
    //               return "<span style='color:#34BD66;'>质量检验</span>"
    //             }
    //         }
    //     }, 
      
    // 获取数据列表
    getData() {
      this.$refs.processconfiguration.getDataList()
      // this.$refs.processconfiguration.getDataList()
    },
    handleSelectionChange(val) {
      // 多行选中