Merge remote-tracking branch 'origin/master'

王震

2023-09-15 52e8286286ffc5920908976c666ca110d0055e15

Merge remote-tracking branch 'origin/master'

 src/assets/api/controller.js

@@ -77,6 +77,7 @@
    finishedInspectChooseMater: "/finished-inspect/chooseMater",//根据订单号得到信息
    finishedInspectAddFinish: "/finished-inspect/addFinish", //新增成品检验
    finishedInspectUpdateFinishInspectsById: "/finished-inspect/updateFinishInspectsById",//上报
    finishedInspectSelectFinishInspectsListById: "/finished-inspect/selectFinishInspectsListById"
}
// 过程检验
const processInspection = {
@@ -85,6 +86,8 @@
    inspectionItemUpdateDevByInsId: "/inspection-item/updateDevByInsId",//更改设备
    inspectionItemlose_focus_update: "/inspection-item/lose_focus_update",//检验值
    processInspectUpdateProcessInspectsById: "/processInspect/updateProcessInspectsById",//上报
    inspectionItemChooseDev: "/inspection-item/chooseDev",
    processInspectSelectProcessInspectsListById: "/processInspect/selectProcessInspectsListById" 
}
// QMS实验室管理
const laboratory = {

 src/components/view/finishedProductInspectionAdd.vue

@@ -38,8 +38,8 @@
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
                                    placeholder="请选择产品名称">
                                <el-select @change="changeOptionsSamplename" style="width: 180px;"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
@@ -68,8 +68,8 @@
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="请输入产品编码"
                                    autocomplete="off" />
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
@@ -151,22 +151,11 @@
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                            }`
                            "></i>
                            {{ data.name }}</span>
                <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                    </el-option>
                </el-select>
                    </div>
                </el-tree>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 消</el-button>
                <el-button type="primary" @click="clickNodeSure()">确 定</el-button>
            </span>
        </el-dialog>
    </div>
</template>
@@ -207,7 +196,7 @@
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "D-001",
                orderNumber: "",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
@@ -254,7 +243,10 @@
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // 点击选择存储当前行索引
                rpId: "" // 点击选择存储当前行项目Id
@@ -262,13 +254,13 @@
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    mounted() {
        this.getTableData()
        this.getOptions();
        // this.getOptions();
    },
    methods: {
        changeOptionsSamplename(){
@@ -311,8 +303,14 @@
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
            });
        },
@@ -321,9 +319,15 @@
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
@@ -346,8 +350,20 @@
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
@@ -441,6 +457,13 @@
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
                params: {
                    id: this.detailId
                }
            }).then(res => {
                this.processInspectVo.technologyId = res.data[0].techId
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,

 src/components/view/finishedProductInspectionUp.vue

@@ -38,8 +38,8 @@
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
                                    placeholder="请选择产品名称">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
@@ -68,14 +68,14 @@
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="请输入产品编码"
                                    autocomplete="off" />
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="请输入数量"
                                    autocomplete="off" />
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity"
                                    placeholder="请输入数量" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="3" style="display: flex;justify-content: end;">
@@ -88,7 +88,8 @@
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;">
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span"
                    style="display: flex;justify-content: end;">
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                    <el-button style="margin-right: 30px;" size="mini"
                        @click="clickAddInspectionColumn()">添加检验值列</el-button>
@@ -154,7 +155,8 @@
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <template slot-scope="scope"> 
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">上报</el-button>
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
                            @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
@@ -162,22 +164,11 @@
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                            }`
                            "></i>
                            {{ data.name }}</span>
                <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                    </el-option>
                </el-select>
                    </div>
                </el-tree>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 消</el-button>
                <el-button type="primary" @click="clickNodeSure()">确 定</el-button>
            </span>
        </el-dialog>
    </div>
</template>
@@ -224,7 +215,8 @@
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
                unit: null,
                technologyId: null
            },
            InspectioniD: null,
            addInspectionform: [
@@ -267,7 +259,10 @@
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // 点击选择存储当前行索引
                rpId: "" // 点击选择存储当前行项目Id
@@ -275,9 +270,9 @@
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    mounted() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
@@ -297,7 +292,7 @@
        this.inspectionResultForm[0].conclusion=this.rowInfo.result
        this.detailId=this.rowInfo.id
        this.getTableData()
        this.getOptions();
        // this.getOptions();
    },
    methods: {
        escalation() {
@@ -384,8 +379,14 @@
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
            });
        },
@@ -394,9 +395,15 @@
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
@@ -419,8 +426,20 @@
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
@@ -514,6 +533,14 @@
            })
        },
        getTableData() {
            console.log(this.rowInfo);
            this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
                params: {
                    id: this.rowInfo.id
                }
            }).then(res => {
                this.processInspectVo.technologyId = res.data[0].techId
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,

 src/components/view/processInspection.vue

@@ -59,7 +59,8 @@
              <template slot-scope="scope">
                <el-button type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;">详情</el-button>
                <el-button type="text" size="small" >查看</el-button>
                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"  @click="updateInsInfo(scope.row)">编辑</el-button>
                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"
                  @click="updateInsInfo(scope.row)">编辑</el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -171,8 +172,8 @@
            > -->
          </el-col>
        </el-row>
        <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
          style="width: 100%">
        <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
          height="calc(100vh - 550px)" style="width: 100%">
          <el-table-column type="index" label="序号" width="60"></el-table-column>
          <el-table-column label="项目" prop="father"></el-table-column>
          <el-table-column prop="name" label="指标"></el-table-column>
@@ -222,22 +223,11 @@
      </div>
      <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
        <div class="div_device_dialog">
          <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
          </el-input>
          <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all highlight-current
            @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
            <div class="custom-tree-node" slot-scope="{ data }">
              <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                }`
                "></i>
                {{ data.name }}</span>
          <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
            </el-option>
          </el-select>
            </div>
          </el-tree>
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="centerDialogVisible = false">取 消</el-button>
          <el-button type="primary" @click="clickNodeSure()">确 定</el-button>
        </span>
      </el-dialog>
    </div>
    <div class="newPage" v-if="showUp">
@@ -334,7 +324,10 @@
        children: "children",
        label: "name"
      },
      nodeData: "", // node点击保存当前点击数据
      nodeData: {
        id: 0,
        name: null
      }, // node点击保存当前点击数据
      clickSelectDevice: {
        index: "", // 点击选择存储当前行索引
        rpId: "" // 点击选择存储当前行项目Id
@@ -348,7 +341,7 @@
  },
  mounted() {
    // this.getTableData()
    this.getOptions();
    // this.getOptions();
  },
  methods: {
    handleClick(row){
@@ -386,8 +379,14 @@
      return data.name.indexOf(value) !== -1;
    },
    // 获取设备树内容
    getOptions() {
      this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
    getOptions(row) {
      this.$axios.get(this.$api.url.inspectionItemChooseDev, {
        params: {
          father: row.father,
          name: row.name,
          technologyId: this.processInspectVo.technologyId
        }
      }).then(res => {
        this.materialOptions = res.data;
      });
    },
@@ -396,9 +395,15 @@
      this.centerDialogVisible = true;
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.id;
      this.options(scope.row)
    },
    // 点击树里面的确定
    clickNodeSure() {
      let select = this.materialOptions.filter(item => {
        return item.id === this.filterText
      })[0]
      this.nodeData.id = select.id
      this.nodeData.name = select.device
      if (this.detailId == null) {
        this.inspectionItems[
          this.clickSelectDevice.index
@@ -421,8 +426,20 @@
      }
    },
    changeState(row, index) {
        console.log(row);
        if(row.did!=null&&row.did!=''){
        let val = row.empiricalValueAddss.filter(item => {
          return item != '' && item != null
        })
        let eq = val.filter(item => {
          return /^[^><=]/.test(item)
        })
        if (eq.length > 0) {
          this.$message({
            message: "检测值[" + eq + "]格式首位应包含>,<或者=",
            type: 'warning'
          });
          return
        }
          let str=""
        row.empiricalValueAddss.forEach(e=>{
            str+=e+","
@@ -434,6 +451,13 @@
      }, {
        headers: { "Content-Type": "application/json" }
      }).then(res => {
          if (res.message === '内控值输入格式有问题!') {
            this.$message({
              message: res.message,
              type: 'warning'
            });
            return
          }
        row.result=res.data.result
        row.username=res.data.username
      })           
@@ -507,7 +531,7 @@
        specificationsModel: val.specificationsModel,
        techfather: val.techfather,
        techname: val.techname,
        technologyId: val.technologyId,
        techId: Number(val.technologyId),
        unit: val.unit
      }, {
        headers: { "Content-Type": "application/json" }
@@ -669,10 +693,12 @@
.node_i {
  color: orange;
}

.div_device_dialog {
  min-height: 400px;
  overflow: auto;
}

.nav {
  display: flex;
  padding: 20px 20px;
@@ -742,5 +768,4 @@
.inspectionProject_span .el-button {
  float: right;
  font-size: 13px !important;
}
</style>
}</style>

 src/components/view/processInspectionUpdate.vue

@@ -103,8 +103,8 @@
            > -->
                </el-col>
            </el-row>
            <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                style="width: 100%">
            <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
                height="calc(100vh - 550px)" style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
                <el-table-column prop="name" label="指标"></el-table-column>
@@ -157,7 +157,8 @@
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <template slot-scope="scope"> 
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">上报</el-button>
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
                            @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
@@ -165,22 +166,15 @@
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                            }`
                            "></i>
                            {{ data.name }}</span>
                <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                    </el-option>
                </el-select>
                    </div>
                </el-tree>
            </div>
            <span slot="footer" class="dialog-footer">
            <!-- <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 消</el-button>
                <el-button type="primary" @click="clickNodeSure()">确 定</el-button>
            </span>
            </span> -->
        </el-dialog>
    </div>
</template>
@@ -266,7 +260,10 @@
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // 点击选择存储当前行索引
                rpId: "" // 点击选择存储当前行项目Id
@@ -274,9 +271,9 @@
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    created() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
@@ -297,7 +294,6 @@
        // console.log(this.detailId);
    },
    mounted() {
        this.getOptions();
        this.getTableData()
    },
    methods: {
@@ -361,8 +357,14 @@
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
            });
        },
@@ -375,9 +377,15 @@
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
@@ -400,8 +408,20 @@
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
@@ -505,6 +525,15 @@
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
                params: {
                    id: this.rowInfo.id
                }
            }).then(res => {
                // console.log(res.data);
                this.processInspectVo.technologyId = res.data[0].techId
                // console.log(this.processInspectVo);
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,

 src/components/view/rawInsDetail.vue

@@ -474,6 +474,19 @@

    // 修改项目的检测值改变结论
    async changeState(row, index) {
      let val=row.testValueList.filter(item=>{
        return item!=''&&item!=null
      })
      let eq=val.filter(item=>{
        return /^[^><=]/.test(item)
      })
      if(eq.length>0){
        this.$message({
                    message: "输入值["+eq+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
      return
      }
      if (this.detailId !== null) {
        const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
          DevId: row.deviceId,

 src/components/view/standard-table/target.vue

@@ -79,6 +79,7 @@
      },
      //选择某行
          selectTr(selection, row) {
        console.log("sss---",selection,row);
        this.$set(row, "isChecked", !row.isChecked);
        this.$nextTick(() => {
          this.isAllSelect = row.isChecked;
@@ -87,6 +88,7 @@
      },
      //递归子级
      toggleSelect(data, flag, type) {
        console.log("递归子级---",data,flag,type);
        if (type === "all") {
          if (data.length > 0) {
            data.forEach((item) => {
@@ -108,6 +110,7 @@
      },
      //改变选中
      toggleSelection(row, flag) {
        console.log("改变选中---",row,flag);
        this.$set(row, "isChecked", flag);
        this.$nextTick(() => {
          if (flag) {

 src/components/view/standard.vue

@@ -13,7 +13,7 @@
    </div>
    <div class="thing">
      <div class="left">
        <el-row :gutter="5" style="position: fixed;top: 148px;z-index: 1;">
        <el-row :gutter="5" >
          <el-col :span="21">
            <el-input v-model="search" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable></el-input>
          </el-col>
@@ -44,17 +44,20 @@
            <el-option :value="2" label="物料清单"></el-option>
            <el-option :value="3" label="生产工艺"></el-option>
          </el-select>
          <span>{{ tableType == 1 ? '项目：' : '工艺名称：' }}</span>
          <el-input v-model="searchName" size="small" placeholder="请输入" style="width: 224px;margin-right: 50px;"
            clearable></el-input>
          <span>版本：</span>
          <el-select v-model="version2" @change="verevent" size="small" style="width: 280px;margin-right: 10px;" placeholder="请选择">
            <el-option v-for="item in version" :key="item" :label="item" :value="item">
          <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="请选择">
            <el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
          <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>重 置</span></el-button>
          <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>查
              询</span></el-button>
          <span>{{ tableType == 1 ? '项目：' : '工艺名称：' }}</span>
          <el-input v-model="searchName" size="small" placeholder="请输入" style="width: 224px;margin-right:10px"
            clearable></el-input>
          <el-button size="mini" @click="() => { searchName = ''; selectAll() }">
            <span>重 置</span>
          </el-button>
          <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectAll">
            <span>查 询</span>
          </el-button>
        </div>

        <div class="contentTable" v-if="this.typeselect == 0">
@@ -485,7 +488,6 @@
      formTypeOptions: null,
      typeselect: 0,
      returntree: {id:28},
      version: {},
      leftAdd:{
        type: [],
        father: null,
@@ -493,9 +495,8 @@
        name: null,
        specifications: null
      },
      version2: {},
      verdata: {},
      character: 0,
      versionData: [],
      versionVal: null,
      restaurants: [],
      bomName:[],
      bomStandard:[],
@@ -719,7 +720,7 @@
        }).then(() => {
          this.$axios.post(this.$api.url.addVersion,{
            specificationsId : this.returntree.id,
            version : this.version2.substring(1,2),
            version : this.versionVal,
          }).then(res=>{
            this.selectVersion();
            this.$message.success(res.message);
@@ -736,6 +737,7 @@
          let obj = {}
          if(type == 0){
            obj = {
                version : this.versionVal,
                specificationsId: Number.parseInt(this.returntree.id),
                deviceGroup: this.technologyForm.deviceGroup,
                father: this.technologyForm.tefather,
@@ -744,11 +746,14 @@
              }
              this.submitBomAdd(this.$api.url.addTechnology,obj);
          }else if(type == 1){
            this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
            obj = this.targetForm;
            obj.version = this.versionVal;
            this.submitBomAdd(this.$api.url.addProductByStandard,obj);
          }else if(type == 2){
            obj = {
              mbomDto2List:this.materialForm.tableList,
              technologyId:this.materialForm.mtechnologyId
              technologyId:this.materialForm.mtechnologyId,
              version : this.versionVal
            }
            this.submitBomAdd(this.$api.url.addMBomByStandard,obj);
          }else if(type == 3){
@@ -758,12 +763,17 @@
                    product: form.product,
                    productFather: form.productFather,
                    technologyId: form.protechnologyId,
                    unit: form.unit
                    unit: form.unit,
                    version : this.versionVal
                }
                this.submitBomAdd(this.$api.url.addTechniqueByStandard,obj);
          }else{
            return
          }
          this.technologyVisible = false;
          this.targetVisible = false;
          this.materialVisible = false;
          this.productVisible = false;
        }
      })
    },
@@ -777,10 +787,6 @@
      }).catch(error=>{
        this.$message.error(error.message);
      })
      this.technologyVisible = false;
      this.targetVisible = false;
      this.materialVisible = false;
      this.productVisible = false;
    },
    //清空新增bom表单
    clearBomAddModel(){
@@ -835,7 +841,10 @@
    //物料清单--获取工序，工艺列表
    getMaterialFormList(){
      this.$axios.get(this.$api.url.chooseTechByMBom,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.materialFormList = res.data;
      }).catch(error=>{
@@ -851,7 +860,10 @@
    //技术指标--获取工序，工艺列表
    getTargetFormList(){
      this.$axios.get(this.$api.url.chooseTechByStandard,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.targetFormList = res.data;
      }).catch(error=>{
@@ -861,7 +873,10 @@
    //1.生产工艺-->选择工序,工艺
    getProductFormList(){
      this.$axios.get(this.$api.url.chooseTechByProduct,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.productFormList = res.data;
      }).catch(error=>{
@@ -913,7 +928,10 @@
    //工艺路线--获取工序列表
    getFatherList(){
      this.$axios.get(this.$api.url.chooseFather,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version: this.versionVal
        }
      }).then(res=>{
        this.fatherList = res.data;
      }).catch(error=>{
@@ -1009,10 +1027,8 @@

    },
    TYPE(val) {//类型.数据
      // console.log(val);
      this.typeselect = val

      // console.log(this.typeselect);
      this.searchName = '';
      this.selectVersion()
    },
    handleNodeClick(val) {//树的值
@@ -1022,23 +1038,24 @@
      }
    },
    async selectVersion() {//版本
      let v=await this.$axios.get(this.$api.url.selectVersion, {
      this.versionData = [];
      await this.$axios.get(this.$api.url.selectVersion, {
        params: {
          specificationsId: this.returntree.id,
          type: this.typeselect,
        }
      }).then(res => {
        this.verdata = res.data
        this.version = this.verdata.map(el => {
          return el = `v${el}`
        //初始化版本选择列表
        if(res.data != null){
          res.data.forEach(item=>{
            this.versionData.push({
              label:"v"+item,
              value:item
        })
        // console.log("版本");
        return this.verdata[0]
            this.versionVal = res.data[0];
      })
      this.character=v
      if(this.character != undefined){
        this.version2="v"+v
      }
      })
      this.selectAll()
    },
    //右侧数据
@@ -1047,7 +1064,8 @@
        params: {
          specificationsId: this.returntree.id,//tree的点击反馈
          type: this.typeselect,//类型
          version: this.character,//版本
          version: this.versionVal,//版本
          message: this.searchName//搜索条件
        }
      }).then(res => {
        let arr = res.data;
@@ -1059,21 +1077,14 @@
      let arr = data;
      for(var i=0;i<arr.length;i++){
            arr[i].rowId = Math.random();
            arr[i].indents = 1;
            if(arr[i].children != undefined){
              this.formatData(arr[i].children);
            }
        }
    },
    verevent(val) {
      // console.log(val);
      let cc = val.replace('v', '')
      // console.log(cc);
      this.character = cc
      this.versionVal = val
      this.selectAll()
      // const { v, ...newObj } = val;
      // delete newObj.v
      // console.log(newObj);
    },
    //五级树
    selectMaterialTree() {
@@ -1109,7 +1120,6 @@
          })
          }
        }
        console.log(this.list);
        this.selectDataList()
        // 默认第一个五级节点搜索，新增配置项
        const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1157,26 +1167,6 @@
    },
    nodeClose(data, node, el) {
      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
    },
    async selectProductTableData() {
      switch (this.tableType) {
        case 0:
          const { data: technologyList } = await this.$axios.get(this.$api.url.selectTechnologyByMaterial, { params: { specificationId: this.checkTreeNode.id, technologyName: this.searchName } })
          this.tableData = technologyList
          break;
        case 1:
          const { data: productList } = await this.$axios.get(this.$api.url.selectProductByMaterial, { params: { specifications: this.checkTreeNode.id, project: this.searchName } })
          productList.forEach((item, index) => {
            item.name = item.father
            item.index = index + 1
            item.id = item.father
            if (item.children.length === 1) {
              productList[index] = { ...item.children[0], index: index + 1, name: item.father }
            }
          })
          this.tableData = productList
          break;
      }
    },
    // 递归更改添加级联所需属性
    replaceProp(arr){