Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/quality/processconfiguration/index.vue

@@ -43,19 +43,28 @@
                      <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-row>
                          <div style="padding: 20px;">
                          <el-radio label="返修">返修</el-radio>
                          <el-radio label="接收">接收</el-radio>
                          <el-radio label="降级使用">降级使用</el-radio> 
                          <el-radio label="报废">报废</el-radio> 
                          </div>
                          <div style="padding: 20px;">
                          <el-radio label="返工">返工</el-radio> 
                          <el-radio label="降为他用">降为他用</el-radio> 
                          </div>
                    </el-row>
                    </el-radio-group>
                </div>
            </el-form>
            <span slot="footer" >
                <el-button @click="dialogVisible = false">取 消</el-button>
                <el-button @click="WayCancel()">取 消</el-button>
                <el-button type="primary" @click="WaySure()">确 定</el-button>
            </span>
        </el-dialog>
@@ -73,6 +82,7 @@
import TableForm from './table-form'
import { mapGetters } from 'vuex'
// import { remote } from '@/api/admin/dict'
import { transform } from '@/util/fileTransform'
import ttable from '@/views/common/ztt-table.vue'
export default {
  data() {
@@ -253,44 +263,14 @@
          //     return this.processModeOptions
          //   }
          // },
          //发起人
            // {
            //   minWidth: '200',
            //   prop: 'originator',
            //   label: '发起人',
            //   sort: true,
            //   isTrue: true,
            //   isSearch: true,
            //   searchInfoType: 'text'
            // },
          // 审核人
          // {
          //   minWidth: '140',
          //   prop: 'examiner',
          //   label: '审核人',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 处理人
          // {
          //   minWidth: '120',
          //   prop: 'handler',
          //   label: '处理人',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
        
        ],
        toolbar: [
          {
            text: '导出',
            type: 'primary',
            fun: this.handleExport
          },
          // {
          //   text: '导出',
          //   type: 'primary',
          //   fun: this.handleExport
          // },
        ],
        operator: [
          // {
@@ -319,7 +299,7 @@
          minWidth: 100
        }
      },
      materialType: [{label:'原材料检验',value:'原材料检验'},{label:'过程检验',value:'过程检验'},{label:'产品检验',value:'产品检验'}],
      materialType: [{label:'原材料检验',value:'原材料检验'},{label:'过程检验',value:'过程检验'},{label:'产品检验',value:'产品检验'},{label:'包装检验',value:'包装检验'}],
      StateList: [{label:'全部',value:''},{label:'已提交审核',value:'1'},{label:'待处理',value:'0'},{label:'已处理',value:'2'}],
      insStateList: [{label:'其他',value:''},{label:'瑕疵',value:'1'}],
    }
@@ -341,7 +321,6 @@
    },
    handleExport(){
      exportData(this.queryParam).then(res=>{
          console.log(res)
          this.downloadFun(res)
      }).catch(error=>{
          console.log(error);
@@ -369,6 +348,12 @@
      this.UserId = row.id
      this.type = row.type
      this.dialogVisible = true;

    },
    WayCancel(){
      this.dialogVisible = false
      this.checkList = null
      this.WayIdea = null
    },
    WaySure(){
      AuditSuggestion({id:this.UserId,way:this.checkList}).then(
@@ -381,9 +366,7 @@
    },
    //提交审核
   Submitreview(row){
      console.log(row.id);
       pullInsUnapi({id:row.id}).then(res =>{
        console.log(res);
        this.$refs.processconfiguration.refreshData()
       })
    },