zouyu
2023-11-01 125b765551a31599e7e6f289ab722c28e98a8bfa
Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
已修改2个文件
56 ■■■■■ 文件已修改
src/api/quality/unqualifiedprocess.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/processconfiguration/index.vue 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/quality/unqualifiedprocess.js
@@ -16,13 +16,13 @@
  })
}
// export function pullInsi(query) {
//   return request({
//     url: '/mes/qualityInspectUnaccepted/getResult',
//     method: 'post',
//     params: query
//   })
// }
export function AuditSuggestion(query) {
  return request({
    url: '/mes/qualityInspectUnaccepted/getResult',
    method: 'post',
    params: query
  })
}
export function fetchListUnqualifiedProcess(query) {
  return request({
src/views/quality/processconfiguration/index.vue
@@ -22,25 +22,33 @@
      <table></table>
    </basic-container>
    <div>
      <el-dialog title="最终处置意见" :visible.sync="dialogVisible" width="30%">
      <el-dialog title="最终处置意见" :visible.sync="dialogVisible" width="38%">
            <el-form label-width="120px">
                <div>
                    <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-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-checkbox-group> -->
                    <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-group>
                </div>
            </el-form>
            <span slot="footer" >
                <el-button @click="dialogVisible = false">取 消</el-button>
                <el-button type="primary" @click="WaySure">确 定</el-button>
                <el-button type="primary" @click="WaySure()">确 定</el-button>
            </span>
        </el-dialog>
    </div>
@@ -48,7 +56,7 @@
</template>
<script>
import { UnqualifiedList,pullInsUnapi,
import { UnqualifiedList,pullInsUnapi,AuditSuggestion
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
@@ -57,8 +65,9 @@
export default {
  data() {
    return {
      checkList: [],
      checkList: "",
      WayIdea:'',
      UserId:{},
      ajaxFun: UnqualifiedList,
      addOrUpdateVisible: false,
      multipleSelection: [],
@@ -295,7 +304,7 @@
          minWidth: 100
        }
      },
      materialType: [{label:'原材料检验',value:'原材料检验'},{label:'过程检验',value:'过程检验'},{label:'质量检验',value:'质量检验'}],
      materialType: [{label:'原材料检验',value:'原材料检验'},{label:'过程检验',value:'过程检验'},{label:'产品检验',value:'产品检验'}],
      StateList: [{label:'全部',value:''},{label:'已提交审核',value:'1'},{label:'待处理',value:'0'},{label:'已处理',value:'2'}],
      insStateList: [{label:'其他',value:''},{label:'瑕疵',value:'1'}],
    }
@@ -312,13 +321,20 @@
  },
  methods: {
    //审核结果
    AuditResult(){
      this.dialogVisible = true
    AuditResult(row){
      this.UserId = row.id
      this.dialogVisible = true;
    },
    WaySure(row){
      let aa = this.checkList
       let bb = this.WayIdea
      console.log(aa,bb);
    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.dialogVisible = false
    },
    //提交审核