Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-11 96b73e0c5e4bef9fadbf7f08eb8a5a49d617b292

Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

 src/assets/api/controller.js

@@ -23,6 +23,7 @@
    updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //上报,
    rawSelectDevice: "/rawInsProduct/selectDevice", //查询设备信息
    addRawInspects: "/rawInspect/addRawInspects", // 添加
    updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 更改设备
}
//不合格原材料
const unqualifiedaa ={
@@ -108,8 +109,10 @@
    delAll:"selfcheckModel/delAllTech",//批量删除---.自检

    selectjilu:"/recordModel/selectAllRecord",//生产记录维护---》右边
    selecRecord:"/recordModel/selecRecordById",//生产记录----.编辑
    delQueById:"/recordModel/delQueById",//删除---.记录内容
    selecRecord:"/recordModel/selecRecordById",//生产记录----.新增
    writeRecordById:"/recordModel/writeRecordById",//编辑
    delQueByIdapi:"/recordModel/delQueById",//删除---.记录内容
		
    delAllRecord:"/recordModel/delAllRecord",//删除批量--->记录
    addRecord:"/recordModel/addRecord",//生产记录-------.新增


 src/components/view/Technicalindex.vue

@@ -189,11 +189,11 @@
                size="small" 
                clearable @input="query" ></el-input>
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'father'}" node-key="id" default-expand-all
                    @node-click="handleNodeClick" 
                    @node-click="handleNodeClick" highlight-current
                        >
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.father}} {{ data.name }}</span>
                            {{data.code}} {{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->

 src/components/view/equipmentmaintain.vue

@@ -163,7 +163,7 @@
                suffix-icon="el-icon-search" 
                placeholder="请输入搜索内容" 
                size="small" clearable ></el-input>
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" highlight-current node-key="id" default-expand-all
                        highlight-current  :filter-node-method="filterNode"
                        @node-click="handleNodeClick"
                        >

 src/components/view/laboratoryManagement.vue

@@ -209,6 +209,7 @@
          :props="{ children: 'children', label: 'father' }"
          node-key="id"
          default-expand-all
          highlight-current
          @node-click="handleNodeClick"
        >
          <div class="custom-tree-node" slot-scope="{ node, data }">

 src/components/view/mbom.vue

@@ -137,7 +137,7 @@
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable ></el-input>
                <el-tree :data="list" ref="tree" 
                <el-tree :data="list" ref="tree"  highlight-current
                :props="{children: 'children',label: 'name'}" 
                node-key="id" default-expand-all  @node-click="handleNodeClick" >
                    <div class="custom-tree-node" slot-scope="{ node, data }">

 src/components/view/rawInsDetail.vue

@@ -51,7 +51,7 @@
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.rname"
                v-model="detailInfo.name"
              ></el-input>
              <el-input
                v-else
@@ -64,7 +64,7 @@
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.rcode"
                v-model="detailInfo.code"
              ></el-input>
              <el-input
                v-else
@@ -190,9 +190,10 @@
            <el-input v-else v-model="scope.row.rpUnit" disabled></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="required" label="标准" min-width="150">
        <el-table-column prop="required" label="标准值" min-width="150">
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              v-model="scope.row.required"
              placeholder="请输入标准值"
            ></el-input>
@@ -201,6 +202,7 @@
        <el-table-column prop="internal" label="内控值" min-width="150">
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              v-model="scope.row.internal"
              placeholder="请输入内控值"
            ></el-input>
@@ -272,11 +274,11 @@
      <el-table :data="conclusionTable" style="100%">
        <el-table-column prop="code" label="物料编号"> </el-table-column>
        <el-table-column prop="name" label="物料名称"> </el-table-column>
        <el-table-column prop="names" label="检验员">
        <el-table-column prop="uName" label="检验员">
          <template slot-scope="scope">
            <span
              v-for="item in scope.row.names"
              :key="item && item.userName"
              v-for="item in scope.row.uName"
              :key="item && item.uName"
              :style="{ marginRight: '8px' }"
              >{{ item }}</span
            >
@@ -357,9 +359,8 @@
    this.detailInfo = {};
    if (this.detailId) {
      this.getDetailInfo();
    } else {
      this.getOptions();
    }
    this.getOptions();
  },
  mounted() {},
  computed: {
@@ -367,8 +368,8 @@
      const conclusion = {};
      conclusion.name = this.detailInfo.name;
      conclusion.code = this.detailInfo.code;
      conclusion.names = [
        ...new Set(this.projectTable.map(item => item.userName))
      conclusion.uName = [
        ...new Set(this.projectTable.map(item => item.uName))
      ];
      if (
        this.projectTable.filter(item => item.testState === null).length ===
@@ -409,7 +410,10 @@
        label: "name"
      },
      nodeData: "", // node点击保存当前点击数据
      clickSelectSaveIndex: "" // 点击选择存储列表索引
      clickSelectDevice: {
        index: "", // 点击选择存储当前行索引
        rpId: "" // 点击选择存储当前行项目Id
      }
    };
  },
  watch: {
@@ -434,7 +438,8 @@
          this.detailInfo = res.data;
          this.projectTable = res.data.children;
          this.projectTable.forEach(i => {
            i.testValueList = i.testValue.split(",");
            // 解决重新赋值无法编辑操作
            this.$set(i, "testValueList", i.testValue.split(","));
            // 取最长的列表数
            if (i.testValueList.length > this.empiricalValueAdd) {
              this.empiricalValueAdd = i.testValueList.length;
@@ -465,8 +470,8 @@
      if (this.detailId !== null) {
        const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
          DevId: row.deviceId,
          rpId: this.detailId,
          testValue: row.testValueList[index]
          rpId: row.rpId,
          testValue: row.testValueList.join(",")
        });
        this.$message.success("提交成功");
        this.getDetailInfo(); //重新刷新信息数据
@@ -510,15 +515,30 @@
    // 点击表格选择触发
    clickTableSelect(scope) {
      this.centerDialogVisible = true;
      this.clickSelectSaveIndex = scope.$index;
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.rpId;
    },
    // 点击树里面的确定
    clickNodeSure() {
      this.projectTable[this.clickSelectSaveIndex].deviceId = this.nodeData.id;
      this.projectTable[
        this.clickSelectSaveIndex
      ].deviceName = this.nodeData.name;
      this.centerDialogVisible = false;
      if (this.detailId == null) {
        this.projectTable[
          this.clickSelectDevice.index
        ].deviceId = this.nodeData.id;
        this.projectTable[
          this.clickSelectDevice.index
        ].deviceName = this.nodeData.name;
        this.centerDialogVisible = false;
      } else {
        this.$axios
          .post(this.$api.url.updateDevByRpId, {
            rpId: this.clickSelectDevice.rpId,
            devId: this.nodeData.id
          })
          .then(res => {
            this.getDetailInfo();
            this.centerDialogVisible = false;
          });
      }
    },
    // 删除检验值列
    clickDeleteInspectionColumn() {

 src/components/view/record-content.vue

@@ -111,7 +111,7 @@
    <div class="record_content">
        <div class="title">
            <el-row>
                <el-col :span="12" style="line-height: 32px;">记录内容维护</el-col>
                <el-col :span="12" style="line-height: 32px;">生产记录维护</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">新增</el-button>
                    <!-- <el-button icon="el-icon-edit-outline" @click="modify">修改</el-button> -->
@@ -134,16 +134,20 @@
            <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查
                    询</span></el-button> -->
                <!-- :style="{height: scrollerHeight,overflow:'auto',display: 'flex'}" -->

        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                    @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="query"></el-input>
                <el-tree :data="list" ref="tree"
                style="height: 500px;overflow-y: auto;"
                :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick" highlight-current
                    :key="upIndex">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.code}} {{ data.name }}</span>
                            {{ data.cord }}{{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
@@ -178,7 +182,7 @@
                    <el-col :span="4" style="font-size: 14px;text-align: right;">类型:</el-col>
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.type" placeholder="请选择" style="width: 310px;">
                        <el-select v-model="edit.type" disabled placeholder="请选择" style="width: 310px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -193,6 +197,9 @@
                        <template>
                        <el-select v-model="edit.techFather"
                        placeholder="请选择"
                        <el-select v-model="edit.techFather"
                        placeholder="请选择"
                        disabled
                        @change="workevent"
                        style="width: 310px;">
                            <el-option
@@ -206,10 +213,10 @@
                    </el-col>
                </el-row>
                <el-row style="line-height: 46px;">
                    <el-col :span="4" style="font-size: 14px;text-align: right;">工艺:</el-col>
                    <el-col :span="4" style="font-size:  14px;text-align: right;">工艺:</el-col>
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.techName" placeholder="请选择" style="width: 310px;">
                        <el-select v-model="edit.techName"  disabled placeholder="请选择" style="width: 310px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
@@ -245,12 +252,12 @@
            </span>
        </el-dialog>
        <!-- 新增弹窗 -->
        <el-dialog title="工序新增" :visible.sync="dialogVisible" width="35%">
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.type" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.type"  @change="edittype" placeholder="请选择" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -392,9 +399,13 @@
                typeselect:0,
                upDia: false,
                checkTreeNode:{
                    id:1,
                    id:'',
                },
                upData:{},
                upData:{
                    name:'',
                    unit:'',
                    note:'',
                },
                edit:{
                    name:'',
                    note:'',
@@ -403,12 +414,6 @@
                    type:'',
                    unit:'',
                },
                upData: {
                    id: 0,
                    name: null,
                    unit: null,
                    thing: null
                }
            }
        },
        mounted() {
@@ -420,11 +425,22 @@
                this.$axios.get(this.$api.url.delQueById,)
            },
            childrenClick() {},
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            edittype(val) {
                // this.typeselect = ''
                this.typeselect = val
                this.chooseTechFath()
            },
            //新增
            workevent(val){
                console.log(val);
                let idx = this.process.findIndex(el => el.name === val)
                this.craftapi = this.process[idx].children
                console.log( this.craftapi);
            },
            chooseTechFath() {
            this.$axios.get(this.$api.url.chooseTechFath,{
@@ -436,7 +452,9 @@
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            }).then(res =>{

            })
            },
            addRecord() {
                this.$axios.post(this.$api.url.addRecord,{
@@ -458,30 +476,38 @@
                this.selectjilu()
                this.form = {};
            },
            //编辑    this.upData
            selecRecord() {
                this.$axios.get(this.$api.url.selecRecord,{
                    params:{
                        id:this.upData.id
                    }
                }).then(res => {
                    this.edit = res.data[0]
                    // console.log(this.edit);
                })
            query() {
                this.selectAllleft()
            },
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect}
                params:{type:this.typeselect,message:this.search.technology}
            }).then(res => {
                this.list = res.data;
                console.log(this.list);
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 默认选中节点第一个
            })
            console.log("=======");
            console.log(this.list);
            let one=this.list.filter(item=>{
            return item.children.length>0
            })[0]
            console.log(one);
            let name=one.children[0].id
            console.log(name);
            this.selectjiluStart(name)
            this.selectDataList();
            });
            },
            //默认
            selectjiluStart(name) {
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:name}
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            //selectjilu  checkTreeNode
@@ -571,35 +597,62 @@
            },

            //删除
            delQueById() {
                this.$axios.post(this.$api.url.delQueById,{
            delQueByIdapi() {
                this.$axios.post(this.$api.url.delQueByIdapi,{
                        id:this.upData.id
                })
            },
            deleteRow(index, rows) {
                this.tableData.splice(index,1)
                this.upData.id = rows.id
                this.delQueById()
                this.selectjilu()
                this.delQueByIdapi()
                // this.selectjilu()
            },

            //编辑
            upContent(ob) {
                this.upData = ob
                console.log(this.upData);
                // console.log(this.upData);
                this.selecRecord()
                this.chooseTechFath()
                // this.chooseTechFath()
                this.upDia = true
            },
            submitUpData() {
                this.tableData.forEach(a => {
                    if (a.id == this.upData.id) {
                        a.name = this.upData.name
                        a.unit = this.upData.unit
                        a.thing = this.upData.thing
            selecRecord() {
                this.$axios.get(this.$api.url.selecRecord,{
                    params:{
                        id:this.upData.id
                    }
                }).then(res => {
                    this.edit = res.data[0]
                })
            },
            writeRecordById() {
                // console.log(this.upData.id);
                this.$axios.post(this.$api.url.writeRecordById + '?id=' + this.upData.id,{
                    name:this.upData.name,
                    note:this.upData.note,
                    techTemId:this.edit.id,
                    unit:this.upData.unit
                }, {
                    headers: {
                        "Content-Type": "application/json"
                      }
                }).then(res => {
                    this.selectjilu()
                })
            },
            submitUpData() {
                this.writeRecordById()
                this.$message.success('修改成功')

                this.upDia = false
                    // this.tableData.forEach(a => {
                //     if (a.id == this.upData.id) {
                //         a.name = this.upData.name
                //         a.unit = this.upData.unit
                //         a.thing = this.upData.thing
                //     }
                // })
                // console.log(this.upData);
            }
        }
    }

 src/components/view/self-inspection.vue

@@ -141,7 +141,7 @@
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                <el-tree :data="list" style="height: 500px;overflow-y: auto;" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
                    :key="upIndex">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
@@ -216,7 +216,7 @@
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.value" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.value" placeholder="请选择" @change="edittype" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -442,9 +442,10 @@
                    ids:this.delete
                })
            },
            //编辑
            writeRecordById() {



            },
            //新增
            add() {
                this.dialogVisible = false
@@ -489,6 +490,11 @@
                console.log(this.typeselect);
                this.selectAllleft()
            },
            edittype(val) {
                // this.typeselect = ''
                this.typeselect = val
                this.chooseTechFath()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
@@ -497,8 +503,12 @@
                this.list = res.data;
                console.log(this.list);
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 默认选中节点第一个
            })
            })
            },

            //selectAllSelf   checkTreeNode
            selectAllSelf() {
            this.$axios.get(this.$api.url.selectAllSelf,{

 src/components/view/standard.vue

@@ -16,7 +16,7 @@
      <div class="left">
        <el-input v-model="search" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable></el-input>

        <el-tree :data="list" ref="tree" :default-expand-all="true" :props="{ children: 'children', label: 'name' }"
        <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
          node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
@@ -73,7 +73,7 @@
    <div class="bom-add-model">
      <el-dialog title="BOM新增" :visible.sync="bomAddModelVisible" width="30%">
        <el-form>
            

        </el-form>
        <span slot="footer" class="dialog-footer">
          <el-button @click="bomAddModelVisible = false">取 消</el-button>
@@ -155,7 +155,7 @@
    TYPE(val) {//类型.数据
      console.log(val);
      this.typeselect = val
     

      // console.log(this.typeselect);
      this.selectVersion()
    },

 src/components/view/technology.vue

@@ -174,7 +174,9 @@
          node-key="id"
          default-expand-all
          @node-click="handleNodeClick"
          style="height: 500px;overflow-y: auto;"
          :key="upIndex"
          highlight-current
        >
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span
@@ -185,7 +187,7 @@
                    : 'el-icon-tickets'
                }`"
              ></i>
              {{ data.name }}{{ data.father }}</span
              {{data.code}}{{ data.name }}</span
            >
            <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
@@ -332,6 +334,8 @@
            <template>
              <el-select
                v-model="form.father"
                allow-create
                filterable
                placeholder="请选择"
                style="width: 480px"
              >
@@ -368,6 +372,7 @@
                <template>
                  <el-select
                    v-model="form.elementId"
                    multiple
                    placeholder="请选择"
                    style="width: 200px"
                  >
@@ -567,7 +572,7 @@
    Neworder() {
      this.dialogVisible = false;
      this.addTechTemp();
      // this.form = '';
      this.form = {};
    },
    Deleteapi() {
      this.dialogVisible = false;
@@ -581,7 +586,7 @@

          {
            deviceGroup: this.form.deviceGroup,
            elementId: this.form.elementId,
            elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
            father: this.form.father,
            name: this.form.name,
            type: this.form.type,

 src/main.js

@@ -23,7 +23,9 @@
Vue.use(qs);
Vue.use(api);

const javaApi = 'http://192.168.0.23:8001'
const javaApi = 'http://192.168.0.25:8001'

// const javaApi = '192.168.0.6'