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

王震

2024-01-19 52594553248e87dd391c9d061256b7076b73d67c

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

 src/views/basic/template/index.vue

@@ -111,7 +111,7 @@

              <el-table-column label="单位" prop="unit" align="center">
              </el-table-column>
              <el-table-column label="操作" align="center" 
              <el-table-column label="操作" align="center"
              v-if="permissions.technology_operationtemplate_param_edit">
                <template slot-scope="scope">
                  <el-button

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -268,7 +268,7 @@
                    <el-row>
                      <el-col :span="24" class="productorder-operates-col">
                        <el-card class="productorder-operates" >
                          <el-row>
                          <!-- <el-row>
                            <el-col :span="2" class="frame1">序号
                            </el-col>
                            <el-col :span="4" class="frame1">工序号
@@ -279,44 +279,57 @@
                            </el-col>
                            <el-col :span="3" class="frame1">操作
                            </el-col>
                          </el-row>
                          <!-- <el-table
                          </el-row> -->
                          <el-table
                            id="operationTable"
                            ref="operationTable"
                            class="basic-template-table"
                            :data="operations"
                            style="width: 100%;"
                            height="593px"
                            border
                            highlight-current-row
                            :default-sort="{ prop: 'operationOrder' }"
                            @row-click="operationRowClick"
                          >
                            <el-table-column
                              prop="operationOrder"
                              min-width="50"
                              label="序号"
                            ></el-table-column>
                            >
                            <template slot-scope="scope">
                                <div style="display:flex">
                                    <span style="width:20px;">
                                    <i class="icon aufontAll  h-icon-all-drag"></i
                                    ></span>
                                    <span>{{ scope.row.operationOrder }}</span>
                                </div>
                            </template>
                            </el-table-column>
                            <el-table-column
                              prop="operationNo"
                              header-align="center"
                              align="center"
                              min-width="100"
                              label="工序号"
                            ></el-table-column>
                            <el-table-column
                              prop="operationName"
                              header-align="center"
                              align="center"
                              min-width="100"
                              label="工序描述"
                            ></el-table-column>

                            <el-table-column
                              prop="partName"
                              header-align="center"
                              align="center"
                              min-width="100px"
                              label="零件"
                            ></el-table-column>

                            <el-table-column
                              prop="remark"
                              header-align="center"
                              align="center"
                              min-width="50"
                              label="操作"
                            >
                              <template slot-scope="scope">
@@ -328,8 +341,8 @@
                                </el-button>
                              </template>
                            </el-table-column>
                          </el-table> -->
                          <zttdraggable
                          </el-table>
                          <!-- <zttdraggable
                            :forceFallback="true"
                            :list="operations"
                            :animation="200"
@@ -363,14 +376,10 @@
                                </el-col>
                              </el-row>
                            </div>
                          </zttdraggable>
                          </zttdraggable> -->
                        </el-card>
                      </el-col>
                    </el-row>
                  
                  
                  
                  
                  </el-col>
                  <el-col :span="16">
                    <el-tabs type="card" ref="paramTabs">
@@ -1064,12 +1073,40 @@
.productorder-operates-col {
  margin-bottom: 0px;
}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
  padding-left: 0px;
  padding-right: 0px;
}

.basic-template-table .el-table__body .el-table__row:hover {
  cursor: move;
}

.basic-template-table .el-table__body .el-table__row:hover .icon {
  display: inline-block;
}

.basic-template-table .el-table__body .el-table__row .icon {
  color: rgba(0, 0, 0, 0.45);
  font-size: 12px;
  line-height: 18px;
  display: none;
}

.aufontAll {
  font-family: aufontAll !important;
  font-size: 14px;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
}
</style>

<style scoped>
/deep/ .el-input-number.is-without-controls .el-input__inner {
  text-align: start;
}

</style>
<script>
import {
@@ -1246,6 +1283,7 @@
    }
  },
  mounted() {
    this.rowDrop()
    window.addEventListener(
      'hashchange',
      () => {
@@ -1405,6 +1443,50 @@
    }
  },
  methods: {
    rowDrop() {
      const that = this
      const tbody = document.querySelector(
        '#operationTable .el-table__body-wrapper tbody'
      )
      Sortable.create(tbody, {
        // 结束拖拽
        onEnd({ newIndex, oldIndex }) {
          if (newIndex > oldIndex) {
            // 下移
            that.operations
              .filter((e) => e.operationOrder == oldIndex + 1)
              .forEach((e) => (e.operationOrder = 'x'))
            that.operations
              .filter((e) => e.operationOrder > oldIndex + 1 && e.operationOrder <= newIndex + 1)
              .forEach((e) => (e.operationOrder = e.operationOrder - 1))
            that.operations
              .filter((e) => e.operationOrder == 'x')
              .forEach((e) => (e.operationOrder = newIndex + 1))
          } else if (oldIndex > newIndex) {
            // 上移
            that.operations
              .filter((e) => e.operationOrder == oldIndex + 1)
              .forEach((e) => (e.operationOrder = 'x'))
            that.operations
              .filter((e) => e.operationOrder < oldIndex + 1 && e.operationOrder >= newIndex + 1)
              .forEach((e) => (e.operationOrder = e.operationOrder + 1))
            that.operations
              .filter((e) => e.operationOrder == 'x')
              .forEach((e) => (e.operationOrder = newIndex + 1))
          }
          // 拖拽结束后，保存新的排序
          let data = that.operations.map(el =>{
            return {
              id:el.id,
              operationOrder:el.operationOrder,
            }
          })
          changeOrder(data).then().catch(error => {
                console.error(error)
          });
        }
      })
    },
    dragEnd(e){
      this.operations.forEach((e, i) => {
        e.index = i + 1
@@ -1422,8 +1504,8 @@
        })
        changeOrder(data).then((res) =>{
        }).catch(error => {
                    console.error(error)
                });
            console.error(error)
        });
    },
    getSysParam(paramKey) {
      getSysParam(paramKey).then((response) => {
@@ -1689,7 +1771,7 @@
    },
    // 2.tabs-工艺路线
    //工艺文件选择
    

    // 工艺路线选择
    routingSelectChanged(routingId) {
      this.currentRouting = this.dataForm.routingList.find(
@@ -1762,8 +1844,9 @@
      this.dataForm.bomId = null
    },
    // 点击工艺工序行触发校验工艺是否修改，若修改则不可操作，需先保存，若未修改，则可查询出对应的参数集
    operationRowClick(event) {
          const row = this.operations[event.oldIndex]
    operationRowClick(row) {
        //   const row = this.operations[event.oldIndex]
          console.log(row);
      if (this.dataForm.id != null && this.dataForm.id !== 0) {
        this.routingOperationId = row.technologyRoutingOperationId
        this.moRoutingOperationId = row.id
@@ -2018,6 +2101,17 @@
    // 保存所有参数的修改
    saveAllParamChange() {
      const paramJson = { routingOperationParam: this.templateParamList }
      let num = 0
      this.templateParamList.forEach(e=>{
        var regex=/^[^\(\)|^,]+$/;
        if(!regex.test(e.paramValue)){
            num+=1
        }
      })
      if(num>0){
        this.$message.error("参数值不能包含英文括号或逗号,请检查")
        return
      }
      putRoutingTemplateParamForOrder(paramJson).then((response) => {
        const data = response.data
        if (data.code === 0) {

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -497,7 +497,7 @@
        let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
        val == undefined ? null : this.resultVal=val
      }
      this.init()
      this.init(this.dataForm.id)
      this.getDeviceList()
    },
    watch:{
@@ -770,7 +770,7 @@
                              }
                              updateRawInsProduct(obj).then(res=>{
                                if(res.data.code === 0){
                                  this.init()
                                  this.init(this.dataForm.id)
                                }
                              })
                          }
@@ -794,9 +794,9 @@
          }
        }
      },
      init(){
        if(this.dataForm.id){
          getObj(this.dataForm.id).then(res=>{
      init(id){
        if(id){
          getObj(id).then(res=>{
            let data = res.data.data
            this.dataForm.rawInsNo = data.rawInsNo
            this.dataForm.name = data.name
@@ -883,12 +883,10 @@
        }
      },
      selectBlur(e){
        console.log(e,"-----");
        console.log(e,e.target.tabIndex);
        console.log(e.target.value);
      },
      changeState(row, index) {
          console.log(row.testValueList);
          return
        this.$nextTick(()=>{
            if(row){
                let isTrue = true
@@ -910,23 +908,19 @@
            if (val === undefined || val === '' || val === null) {
                return
            }
            console.log(val);
            console.log(...row.testValueList);
            let obj = {
              deviceId: row.deviceId,
              rpId: row.rpId,
              testValue: val,
              note: row.note
            }
            console.log(obj);
            return
            updateRawInsProduct(obj).then(res => {
                if (res.data.code == 0) {
                    this.$message.success("更新成功")
                } else {
                    this.$message.error("更新失败")
                }
                this.init()
                this.init(this.dataForm.id)
            })
          }
        })
@@ -945,7 +939,11 @@
          let childrenIndex = this.list[i].children.findIndex(el =>{
            return el.iid == row.iid
          })
          this.list[i].children.splice(childrenIndex,1)
          if(this.list[i].children.length<2){
            this.list.splice(i,1)
          }else{
              this.list[i].children.splice(childrenIndex,1)
          }
        }
      },
      //添加子项目
@@ -967,6 +965,7 @@
        row.children.push(obj)
      },
      save(){
        const _than = this
        let data = this.dataForm
        this.list.forEach(item=>{
          item.children.forEach(c=>{
@@ -976,10 +975,13 @@
        data.rawInsProducts = this.list
        addRawInspects(data).then(res=>{
            this.$message.success("保存成功")
            this.$router.go(-1)
            // this.$router.go(-1)
        }).catch(error=>{
          this.$message.error(error)
        })
        _than.$nextTick(()=>{
            _than.init(Number(res.data.msg))
        })
      },
      getDeviceList(){
        selectDevice().then(res=>{

 src/views/technology/routing/routing-form.vue

@@ -445,7 +445,7 @@
                  effect="dark"
                >
                  {{ item.label }}
                </el-tag> 
                </el-tag>
              </div> -->
              <el-divider content-position="left">备注</el-divider>
              <div class="node-content-remark">
@@ -695,7 +695,7 @@
      dataRule: {
        partNo: [
          { required: true, message: '零件不能为空', trigger: 'blur' }
        ], 
        ],
        bomTypeDb: [
          { required: true, message: '工艺类型不能为空', trigger: 'change' }
        ],
@@ -1397,6 +1397,17 @@
    // 保存所有参数的修改
    saveAllParamChange() {
      const paramJson = { routingOperationParam: this.paramData }
      let num = 0
      this.paramData.forEach(e=>{
        var regex=/^[^\(\)|^,]+$/;
        if(!regex.test(e.paramValue)){
            num+=1
        }
      })
      if(num>0){
        this.$message.error("参数值不能包含英文括号或逗号,请检查")
        return
      }
      putRoutingTemplateParam(paramJson).then((response) => {
        const data = response.data
        if (data.code == 0) {