loulijun2021
2023-03-03 5b23c2562004da7d6c06c42447a20dbd2f097672
1.节拍工价、工单新增控制必须设置计件单价
已修改6个文件
62 ■■■■ 文件已修改
src/api/scgl.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/sckbg.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gxdy.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/scgl.js
@@ -305,3 +305,11 @@
  })
}
// 工单派发选择工艺路线或选择生产车间时判断绑定条件
export function SelectRouteOrWkshop(data) {
  return request({
    url: 'ProductionManagement/SelectRouteOrWkshop',
    method: 'get',
    params: data
  })
}
src/views/scgl/gd.vue
@@ -581,6 +581,7 @@
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.routecode===''"
              @change="wkshopcodeChange"
            >
              <el-option
                v-for="item in wkshopArr"
@@ -687,9 +688,19 @@
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <!--          <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">预览</el-button>-->
          <el-button
            v-if="!sumbitBottonIsDisabled"
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="dialogVisibleConfirm"
          >确 定</el-button>
          <el-button
            v-if="sumbitBottonIsDisabled"
            v-waves
            type="primary"
            disabled
            @click="dialogVisibleConfirm"
          >确 定</el-button>
        </div>
@@ -1604,7 +1615,7 @@
  AddUpdateMesOrder,
  ClosedMesOrder,
  DeleteMesOrder, ErpOrderSearch,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SearchWorkStepSopList,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SearchWorkStepSopList, SelectRouteOrWkshop,
  SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1841,7 +1852,9 @@
      /* 文件预览部分*/
      dialogVisibleCheck: false,
      sopSelectArr: [], // sop下拉选项数组
      sopSelectValue: ''// sop下拉选中值
      sopSelectValue: '', // sop下拉选中值
      sumbitBottonIsDisabled: false
    }
  },
  created() {
@@ -1950,6 +1963,20 @@
    getCurrentRow(wo_code) {
      this.radioSelected = wo_code
    },
    // 生产车间值改变时
    wkshopcodeChange(val) {
      const data = {
        partcode: this.dialogForm.partcode,
        routecode: this.dialogForm.routecode,
        wkshopcode: val
      }
      SelectRouteOrWkshop(data).then((res) => {
        // console.log(res, 1)
      }).catch(err => {
        // console.log(err, 2)
        this.sumbitBottonIsDisabled = true
      })
    },
    // 新增按钮
    async add(operation) {
      this.operation = operation
@@ -1978,6 +2005,8 @@
      }
      this.dialogForm.wkshopcode = ''
      this.sumbitBottonIsDisabled = false
    },
    // 工艺路线值改变
    async routecodeChange(val) {
@@ -2149,6 +2178,7 @@
      this.dialogForm.orderlev = '' // 工单等级
      this.$refs.dialogForm.clearValidate()
      this.sumbitBottonIsDisabled = false
    },
    // 对话框取消
    dialogVisibleCancel() {
src/views/scgl/sckbg.vue
@@ -550,6 +550,7 @@
            v-model="dialogForm.eqpcode"
            style="width: 200px;"
            placeholder="请选择"
            filterable
          >
            <el-option
              v-for="item in ZZeqpArr"
@@ -599,11 +600,12 @@
            v-model="dialogForm.reportuser"
            style="width: 200px;"
            placeholder="请选择"
            filterable
          >
            <el-option
              v-for="item in ZZuserArr"
              :key="item.usercode"
              :label="item.username"
              :label="item.username+' / '+item.usercode"
              :value="item.usercode"
            />
          </el-select>
@@ -613,6 +615,7 @@
          <el-select
            v-model="dialogForm.eqpcode"
            style="width: 200px;"
            filterable
            placeholder="请选择"
          >
            <el-option
@@ -638,6 +641,7 @@
            :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
            multiple
            collapse-tags
            filterable
          >
            <el-option
              v-for="item in badArr"
@@ -655,6 +659,7 @@
            v-model="dialogForm.operation"
            style="width: 200px;"
            placeholder="请选择"
            filterable
          >
            <el-option
              v-for="item in OperationArr"
src/views/zzmx/gxdy.vue
@@ -364,7 +364,7 @@
          :data="workDialogForm.workTreeArr"
          show-checkbox
          node-key="code"
          style="height: 280px;"
          style="height: 280px;overflow: auto"
          default-expand-all
          :props="workTreeDefaultProps"
          @check="checkBoxClick"
@@ -411,7 +411,7 @@
          :data="defectTree"
          show-checkbox
          node-key="code"
          style="height: 400px;"
          style="height: 400px;overflow: auto"
          default-expand-all
          :props="workTreeDefaultProps"
        />
src/views/zzmx/jpgj.vue
@@ -262,7 +262,7 @@
              <el-option
                v-for="item in partArr2"
                :key="item.partcode"
                :label="item.partname"
                :label="item.partname + ' / '+ item.partcode"
                :value="item.partcode"
              />
            </el-select>
@@ -696,6 +696,9 @@
    },
    // 保存行
    async saveRow(row) {
      if (parseFloat(row.unprice) <= 0) {
        return this.$message.info('计件单价必须大于零!')
      }
      const data = {
        partcode: this.eqpTable.partcode, //  产品编码
        routecode: this.eqpTable.routecode, //  工艺路线编码
vue.config.js
@@ -50,8 +50,8 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        // target: 'http://121.196.36.24:8005', // 请求的第三⽅接⼝地址      本地服务器(灵翔)
        target: 'http://192.168.0.230:8001', // 请求的第三⽅接⼝地址   客户服务器(灵翔)
        target: 'http://121.196.36.24:8005', // 请求的第三⽅接⼝地址      本地服务器(灵翔)
        // target: 'http://192.168.0.230:8001', // 请求的第三⽅接⼝地址   客户服务器(灵翔)
        changeOrigin: true, // 请求跨域时,需 配置此项
        pathRewrite: { // 路径重写,替换target中的请求地址
          ['^' + process.env.VUE_APP_BASE_API]: '/api/'