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

王震

2023-12-20 b3ebb6f99f647a08cac70ebd9cf1baabdffc6852

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

 src/views/plan/customerorder/customerorder-form.vue

@@ -187,12 +187,14 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品名称" prop="productName">
                <el-tooltip class="item" effect="dark" :content="dataForm.productName" >
                <el-input
                  v-model="dataForm.productName"
                  placeholder=""
                  disabled
                >
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -274,11 +276,13 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品型号" prop="customerPartSpec">
                <el-tooltip class="item" effect="dark" :content="dataForm.customerPartSpec" >
                <el-input
                  v-model="dataForm.customerPartSpec"
                  placeholder=""
                  disabled
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
@@ -325,10 +329,12 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
                <el-tooltip class="item" effect="dark" :content="dataForm.shippingAddress" >
                <el-input
                  v-model="dataForm.shippingAddress"
                  placeholder=""
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="6">

 src/views/plan/customerorder/index.vue

@@ -414,6 +414,7 @@
            width: '100px',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',

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

@@ -65,6 +65,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="零件" prop="partId">
                <el-tooltip class="item" effect="dark" :content="partStr" >
                <el-input v-model="partStr" placeholder="" readonly>
                  <el-button
                    v-if="!this.dataForm.id"
@@ -73,6 +74,7 @@
                    @click="openRoutingDialog()"
                  ></el-button>
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>

 src/views/plan/operationtask/operationtask-form.vue

@@ -145,7 +145,7 @@
                          </el-select>
                        </el-form-item>
                      </el-col>
                      <el-col :span="7">
                      <el-col :span="10">
                        <el-form-item label="工作中心" prop="workCenter">
                          <el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="请选择工作中心"
                            style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
                              :key="index">
                            </el-option>
                          </el-select>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="15">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
@@ -167,39 +177,36 @@
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="14">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
                            value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
                          </el-date-picker>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="计划数量" prop="plannedQuantity">
                          <el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="计划数量"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>{{ dataForm.unit }}</span>
                        </el-form-item>
                      </el-col></el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                        <el-form-item label="零件号" prop="partNo">
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                        </el-form-item>
                      </el-col>
                      <el-col :span="6">
                      <el-col :span="10">
                        <el-form-item label="工单所需时间" prop="taskTheoreticalTime">
                          <el-input v-model="dataForm.taskTheoreticalTime" placeholder="工单所需时间"
                            style="width:calc(100% - 30px)"></el-input>
                          <span>min</span>
                        </el-form-item>
                      </el-col>
                      </el-row>
                    <el-row :gutter="10">
                      <el-col :span="12">
                        <el-form-item label="零件" prop="partName">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                          <el-input v-model="dataForm.partName" placeholder="零件" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                      <el-col :span="10">
                        <el-form-item label="零件号" prop="partNo">
                          <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
                          <el-input v-model="dataForm.partNo" placeholder="零件号" disabled></el-input>
                          </el-tooltip>
                        </el-form-item>
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <span style="float:right; margin-right:30px; margin-top: 55px">

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -48,12 +48,14 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品名称：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
                                        :value="item.materialCode">
                                    </el-option>
                                </el-select>
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
@@ -63,7 +65,9 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
                                <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                    </el-row>

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

@@ -31,6 +31,7 @@
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品名称：">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                    <el-select style="width: 100%" @change="changeOptionsSamplename"
                                        :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
                                        size="small" placeholder="请选择产品名称">
@@ -38,6 +39,7 @@
                                            :label="item.material" :value="item.materialCode">
                                        </el-option>
                                    </el-select>
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
@@ -50,8 +52,10 @@
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
                                    <el-input disabled v-model="processInspectVo.specs" 
                                        autocomplete="off" />
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                        

 src/views/quality/teststandard/index.vue

@@ -321,7 +321,7 @@
      isShowQuery: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/testStandard/upload'
      },
      prelang: 'operation',

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

@@ -40,6 +40,7 @@
              </el-form-item>

              <el-form-item label="零件名" prop="partName">
                <el-tooltip class="item" effect="dark" :content="treeForm.partName" >
                <el-input
                  v-model="treeForm.partName"
                  placeholder="零件名"
@@ -47,6 +48,7 @@
                  disabled
                >
                </el-input>
                </el-tooltip>
              </el-form-item>

              <el-form-item label="类型" prop="bomTypeDb">

 src/views/technology/completeproductstructure/index.vue

@@ -10,7 +10,21 @@
        :ajaxFun="ajaxFun"
        ref="completeProductStructureTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addByStructureHandle" 
          v-if="permissions.technology_completeproductstructure_bom">产品结构生成BOM</el-button>
          <el-button @click="() => {this.approveHandle('ACCEPT')}" 
          :disabled="uniqueStateArr.includes('01draft')"
          v-if="permissions.technology_completeproductstructure_accept">批准</el-button>
          <el-button @click="() => {this.approveHandle('REVOKE')}" 
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_completeproductstructure_revoke">撤回</el-button>
          <el-button @click="() => {this.approveHandle('CANCEL')}"
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_completeproductstructure_cancel">拒绝</el-button>
          <el-button @click="() => {this.deleteAll()}" type="primary" 
          v-if="permissions.technology_completeproductstructure_batch_delete">批量删除</el-button>
        </template>
      </ttable>
    </basic-container>
  </div>
@@ -214,54 +228,7 @@
            searchInfoType: 'datetimerange',
          },
        ],
        toolbar: [
          // {
          //   text: '新增',
          //   type: 'primary',
          //   fun: this.addOrUpdateHandle,
          //   disabled: false,
          //   permitArr: []
          // },
          {
            type: 'primary',
            text: '产品结构生成BOM',
            fun: this.addByStructureHandle,
            disabled: false,
            permitArr: [],
          },
          {
            text: '批准',
            fun: () => {
              this.approveHandle('ACCEPT')
            },
            disabled: false,
            permitArr: ['01draft'],
          },
          {
            text: '撤回',
            fun: () => {
              this.approveHandle('REVOKE')
            },
            disabled: false,
            permitArr: ['02accepted'],
          },
          {
            text: '拒绝',
            fun: () => {
              this.approveHandle('CANCEL')
            },
            disabled: false,
            permitArr: ['02accepted'],
          },
          {
            text: '删除',
            fun: () => {
              this.deleteAll()
            },
            disabled: false,
            permitArr: [],
          },
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -291,6 +258,7 @@
          label: '已取消',
        },
      ],
      uniqueStateArr: [],
      bomTypeDbOptions: [],
    }
  },
@@ -333,6 +301,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_completeproductstructure_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'completeProductStructure',
        params: { id: row == null ? null : row.id },
@@ -341,8 +313,6 @@
    // 按产品结构生成BOM
    addByStructureHandle() {
      addByStructure().then((res) => {
        // let result = Array.from(new Set(res.data.data))
        // this.$message.success(result.join(','))
        console.log(res.data.data);
        let mes="";
        res.data.data.forEach(item=>{
@@ -355,13 +325,13 @@
        })
        this.getData()
      })
      // this.$message({
      //   message: '已在后台生成BOM，请执行结束后刷新页面',
      //   type: 'success',
      // })
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_completeproductstructure_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.number, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -453,21 +423,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

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

@@ -113,7 +113,9 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品零件描述" prop="partName">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input v-model="dataForm.partName" disabled> </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>

 src/views/technology/document/index.vue

@@ -14,6 +14,20 @@
          <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
            >ERP同步</el-button
          > -->
          <el-button v-if="permissions.technology_document_add"
          type="primary" @click="addOrUpdateHandle">新增</el-button>

          <el-button @click="() => {this.changeState('accept')}" 
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_accept">批准</el-button>

          <el-button @click="() => {this.changeState('reject')}"
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_reject">拒绝</el-button>

          <el-button @click="() => {this.changeState('cancel')}" 
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_cancel">撤销</el-button>
          <el-button
            type="primary"
            @click="deleteBatch"
@@ -88,6 +102,7 @@
  data() {
    return {
      ids: [],
      uniqueStateArr: [],
      ajaxFun: fetchList,
      multipleSelection: [],
      isShowQuery: false,
@@ -323,43 +338,12 @@
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          // {
          //   text: '复制',
          //   fun: this.copyDocument,
          //   disabled: false,
          //   permitArr: []
          // },
          {
            text: '批准',
            fun: () => {
              this.changeState('accept')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          },
          {
            text: '拒绝',
            fun: () => {
              this.changeState('reject')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          },
          {
            text: '撤销',
            fun: () => {
              this.changeState('cancel')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          }
          /*,
          {
            text: '海缆OA',
@@ -523,6 +507,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_document_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'documentForm',
        query: { id: row == null ? null : row.id }
@@ -530,6 +518,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_document_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工艺文件编号：' + row.number + '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -585,21 +577,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

 src/views/technology/routing/index.vue

@@ -13,20 +13,21 @@
        ref="routingTable"
      >
        <template #toolbar>
          <el-button
            v-if="permissions.technology_routing_ifssync"
            type="primary"
            :loading="ifsSynsLoading"
            @click="syncIfs"
            >IFS同步</el-button
          >
          <el-button
            v-if="permissions.technology_routing_advancecalc"
            type="primary"
            :loading="preCalcLoading"
            @click="calcTech"
            >提前计算</el-button
          >
          <el-button v-if="permissions.technology_routing_add"
          type="primary" @click="addOrUpdateHandle">新增</el-button>
          <el-button @click="() => {this.approveHandle('ACCEPT')}" 
          :disabled="uniqueStateArr.includes('01draft')"
          v-if="permissions.technology_routing_accept">批准</el-button>
          <el-button @click="() => {this.approveHandle('REVOKE')}" 
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_revoke">撤回</el-button>
          <el-button @click="() => {this.approveHandle('CANCEL')}"
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_cancel">拒绝</el-button>
          <el-button @click="copyRouting"
          v-if="permissions.technology_routing_cancel">复制</el-button>
          <el-button @click="() => {this.deleteAll()}" type="primary" 
          v-if="permissions.technology_routing_batch_del">批量删除</el-button>
        </template>
      </ttable>
      <el-dialog title="导入" :visible.sync="importRoutingVisible" width="50%">
@@ -114,7 +115,6 @@
import {
  fetchList,
  delObj,
  changeState,
  changeStateBatch,
  exportRoutingTemplate,
  routingIfsSync,
@@ -132,6 +132,7 @@
  data() {
    return {
      ids: [],
      uniqueStateArr: [],
      ajaxFun: fetchList,
      multipleSelection: [],
      isShowQuery: false,
@@ -356,53 +357,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          {
            text: '批准',
            fun: () => {
              this.approveHandle('ACCEPT')
            },
            disabled: false,
            permitArr: ['01draft']
          },
          {
            text: '撤回',
            fun: () => {
              this.approveHandle('REVOKE')
            },
            disabled: false,
            permitArr: ['02accepted']
          },
          {
            text: '拒绝',
            fun: () => {
              this.approveHandle('CANCEL')
            },
            disabled: false,
            permitArr: ['02accepted']
          },
          {
            text: '复制',
            fun: this.copyRouting,
            disabled: false,
            permitArr: []
          },
          {
            text: '删除',
            fun: () => {
              this.deleteAll()
            },
            disabled: false,
            permitArr: []
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -508,6 +463,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_routing_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'routingForm',
        query: { id: row == null ? null : row.id }
@@ -515,6 +474,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_routing_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工艺编号：' + row.routingNo + '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -613,21 +576,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

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

@@ -50,12 +50,14 @@
            </el-col>
            <el-col :span="6">
              <el-form-item prop="partName" label="零件名称">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input
                  v-model="dataForm.partName"
                  placeholder="零件名称"
                  readonly
                  style="width: 100%"
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -657,8 +659,7 @@
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
      // templateDefaultObj: { dataType: '生产要求' },
      templateDefaultObj: {},
      templateDefaultObj: { dataType: '生产要求' },
      paramSelArr: [],
      paramSelCol: 'code',
      operationIndex: null,

 vue.config.js

@@ -4,9 +4,13 @@
 */



const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

// const url = 'http://localhost:9999'