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

zouyu

2023-11-02 778910ce85e301e63a43439b655cc457a96bbb44

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

 src/error.js

@@ -10,15 +10,15 @@
      info
    })
    if (process.env.NODE_ENV === 'development') {
      console.group('>>>>>> 错误信息 >>>>>>')
      console.log(info)
      console.groupEnd()
      console.group('>>>>>> Vue 实例 >>>>>>')
      console.log(vm)
      console.groupEnd()
      console.group('>>>>>> Error >>>>>>')
      console.log(err)
      console.groupEnd()
      // console.group('>>>>>> 错误信息 >>>>>>')
      // console.log(info)
      // console.groupEnd()
      // console.group('>>>>>> Vue 实例 >>>>>>')
      // console.log(vm)
      // console.groupEnd()
      // console.group('>>>>>> Error >>>>>>')
      // console.log(err)
      // console.groupEnd()
    }
  })
}

 src/views/common/ztt-table.vue

@@ -961,6 +961,7 @@
      }

      return this.doCallback(this.ajaxFun, arr, selectedId)
      this.dataListLoading = false
    },
    doCallback(fn, args, selectedId) {
      return fn

 src/views/quality/processconfiguration/index.vue

@@ -22,27 +22,34 @@
      <table></table>
    </basic-container>
    <div>
      <el-dialog title="最终处置意见" :visible.sync="dialogVisible" width="38%">
      <el-dialog title="最终处置意见" :visible.sync="dialogVisible" width="30%">
            <el-form label-width="120px">
                <div>
                    <el-form-item label="最终处置意见：">
                <div v-if="type === '原材料检验'">
                    <!-- <el-form-item label="最终处置意见：">
                        <el-input type="textarea" :rows="3" placeholder="请输入内容"  v-model="WayIdea" />
                    </el-form-item>
                    <!-- <el-checkbox-group v-model="checkList">
                      <el-checkbox label="返修"></el-checkbox>
                      <el-checkbox label="换货"></el-checkbox>
                      <el-checkbox label="退货"></el-checkbox>
                      <el-checkbox label="作废"></el-checkbox>
                      <el-checkbox label="让步接收"></el-checkbox>
                      <el-checkbox label="降级使用"></el-checkbox>
                    </el-checkbox-group> -->
                    </el-form-item> -->
                    <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 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>
                <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>
@@ -66,9 +73,10 @@
  data() {
    return {
      checkList: "",
      WayIdea:'',
      // WayIdea:'',
      UserId:{},
      ajaxFun: UnqualifiedList,
      type:'',
      ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
      addOrUpdateVisible: false,
      multipleSelection: [],
      typeOptions: [],
@@ -90,6 +98,7 @@
        multiSelect: true, //
        seqNo: true,
        isShowHide: true, // 是否显示显影按钮
        isRefresh: true, // 是否显示刷新按钮
        isSearch: true, // 高级查询按钮
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
@@ -135,7 +144,7 @@
          {
            minWidth: '140',
            prop: 'materialCode',
            label: '产品编号',
            label: '零件号',
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
@@ -315,6 +324,7 @@
  },
  computed: {
    ...mapGetters(['permissions'])

  },
  created() {
    // this.getType()
@@ -323,17 +333,16 @@
    //审核结果
    AuditResult(row){
      this.UserId = row.id
      this.type = row.type
      this.dialogVisible = true;

    },
    WaySure(){
      // console.log(this.checkList);
      // this.aa = this.checkList.join(',')
      // console.log(this.aa);
      // console.log(this.checkList);
      AuditSuggestion({id:this.UserId,way:this.checkList}).then(
        res =>{
          this.checkList = null
          this.WayIdea = null
          this.$refs.processconfiguration.refreshData()
          ;})
      this.dialogVisible = false
    },
@@ -342,6 +351,7 @@
      console.log(row.id);
       pullInsUnapi({id:row.id}).then(res =>{
        console.log(res);
        this.$refs.processconfiguration.refreshData()
       })
    },
   
@@ -367,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) {
      // 多行选中