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

Fixiaobai

2023-11-06 2ecf3363eca41ed38f4bf9f50d62cdd14d75d166

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

 src/views/quality/processconfiguration/index.vue

@@ -3,6 +3,8 @@
    <basic-container>
      <ttable
        :table="table"
        :resultData="resultData"
        @change ="costPlannedAmountChange"
        @handleSelectionChange="handleSelectionChange"
        :uploadInfo="uploadInfo"
        :isShowHide="true"
@@ -42,14 +44,23 @@
                      <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>
@@ -72,6 +83,7 @@
export default {
  data() {
    return {
      resultData:[],
      checkList: "",
      // WayIdea:'',
      UserId:{},
@@ -283,7 +295,7 @@
          {
            text: '导出',
            type: 'primary',
            // fun: this.addOrUpdateHandle
            fun: this.handleExcel
          },
        ],
        operator: [
@@ -330,6 +342,34 @@
    // this.getType()
  },
  methods: {
    async costPlannedAmountChange(value){
            this.resultData= value
        },
    
      handleExcel() {
        console.log(this.resultData);
        console.log(this.table.column);
        let arr = this.table.column.filter(item => item.isTrue == true).map(item => {
                    return{
                        prop:item.prop,
                        label:item.label
                }
            })
        let opt = {
          title: '文档标题',
          column: [{
            label:'不合格处置',
            prop:'header',
            children:arr
          }],
          data: this.resultData
        }
        this.$Export.excel({
          title: opt.title,
          columns: opt.column,
          data: opt.data
        });
      },
    //审核结果
    AuditResult(row){
      this.UserId = row.id

 src/views/quality/rawMaterial/index.vue

@@ -233,8 +233,6 @@
      handleExcel() {
        console.log(this.resultData);
        console.log(this.table.column);
        // let arr = this.table.column.map(el = el.isTrue == true)
        // console.log(arr);
        let arr = this.table.column.filter(item => item.isTrue == true).map(item => {
                    return{
                        prop:item.prop,
@@ -255,8 +253,6 @@
          columns: opt.column,
          data: opt.data
        });
        // console.log(this.table);

      },
        // 删除
        deleteHandle(row) {