loulijun2021
2023-03-03 0aa79c7b9926e01f61de7c6514ea1deffe3bee7c
1.节拍工价、工单新增控制必须设置计件单价
已修改4个文件
123 ■■■■■ 文件已修改
src/api/scgl.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/ckgl.vue 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/scgl.js
@@ -375,3 +375,13 @@
    params: data
  })
}
// 工单派发选择工艺路线或选择生产车间时判断绑定条件
export function SelectRouteOrWkshop(data) {
  return request({
    url: 'ProductionManagement/SelectRouteOrWkshop',
    method: 'get',
    params: data
  })
}
src/views/kb/ckgl.vue
@@ -164,7 +164,7 @@
                  <el-table-column
                    prop="voucherdate"
                    label="单据日期"
                    width="130"
                    width="140"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -174,7 +174,7 @@
                  <el-table-column
                    prop="wo"
                    label="单据编号"
                    width="195"
                    width="228"
                  >
                    <template slot-scope="{row}">
                      <div class="ellipsis">{{ row.wo }}</div>
@@ -183,7 +183,7 @@
                  <el-table-column
                    prop="customename"
                    label="客户"
                    width="125"
                    width="345"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
@@ -200,16 +200,16 @@
                  <!--                      <div v-else>/</div>-->
                  <!--                    </template>-->
                  <!--                  </el-table-column>-->
                  <el-table-column
                    prop="SourceVoucherCode"
                    label="来源单号"
                    width="185"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
<!--                  <el-table-column-->
<!--                    prop="SourceVoucherCode"-->
<!--                    label="来源单号"-->
<!--                    width="185"-->
<!--                  >-->
<!--                    <template slot-scope="{row}">-->
<!--                      <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>-->
<!--                      <div v-else>/</div>-->
<!--                    </template>-->
<!--                  </el-table-column>-->
                  <!--                  <el-table-column-->
                  <!--                    prop="materiel_code"-->
                  <!--                    label="产品编号"-->
@@ -218,7 +218,7 @@
                  <el-table-column
                    prop="materiel_name"
                    label="产品名称"
                    width="170"
                    width="200"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
@@ -237,7 +237,7 @@
                  <el-table-column
                    prop="quantity"
                    label="数量"
                    width="87"
                    width="130"
                  >
                    <template slot-scope="{row}">
                      <div class="ellipsis">{{ row.quantity }}</div>
@@ -246,37 +246,37 @@
                  <el-table-column
                    prop="saleOutQuantity"
                    label="已发货数量"
                    width="100"
                    width="130"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
                      <div v-else>0</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="priuserdefnvc1"
                    label="检验方式"
                    width="110"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="priuserdefnvc2"
                    label="检验人员"
                    width="110"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
<!--                  <el-table-column-->
<!--                    prop="priuserdefnvc1"-->
<!--                    label="检验方式"-->
<!--                    width="110"-->
<!--                  >-->
<!--                    <template slot-scope="{row}">-->
<!--                      <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>-->
<!--                      <div v-else>/</div>-->
<!--                    </template>-->
<!--                  </el-table-column>-->
<!--                  <el-table-column-->
<!--                    prop="priuserdefnvc2"-->
<!--                    label="检验人员"-->
<!--                    width="110"-->
<!--                  >-->
<!--                    <template slot-scope="{row}">-->
<!--                      <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>-->
<!--                      <div v-else>/</div>-->
<!--                    </template>-->
<!--                  </el-table-column>-->
                  <el-table-column
                    prop="deliveryDate"
                    label="预计交货日期"
                    width="141"
                    width="180"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
src/views/scgl/gd.vue
@@ -93,7 +93,9 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
          <div class="bodySearchReset"
               :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
@@ -609,6 +611,7 @@
              :popper-append-to-body="false"
              style="width: 200px;"
              placeholder="请选择"
              @change="wkshopcodeChange"
              :disabled="dialogForm.routecode===''"
            >
              <el-option
@@ -744,10 +747,19 @@
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
          <!--          <el-button v-waves 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>
@@ -1661,7 +1673,7 @@
  AddUpdateMesOrder,
  ClosedMesOrder,
  DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
  SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1906,7 +1918,8 @@
        disabledDate(time) {
          return time.getTime() < Date.now() - 8.64e7
        }
      }
      },
      sumbitBottonIsDisabled: false
    }
  },
  created() {
@@ -1966,6 +1979,20 @@
    // 订单状态改变时
    erporderstusChange(val) {
      this.form.mesorderstus = val
    },
    // 生产车间值改变时
    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
      })
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -2041,6 +2068,8 @@
      }
      this.dialogForm.wkshopcode = ''
      this.sumbitBottonIsDisabled = false
    },
    // 工艺路线值改变
    async routecodeChange(val) {
@@ -2214,6 +2243,7 @@
      this.bomIdArr = []
      this.$refs.dialogForm.clearValidate()
      this.sumbitBottonIsDisabled = false
    },
    // 对话框取消
    dialogVisibleCancel() {
src/views/zzmx/jpgj.vue
@@ -711,6 +711,9 @@
    },
    // 保存行
    async saveRow(row) {
      if (parseFloat(row.unprice) <= 0) {
        return this.$message.info('计件单价必须大于零!')
      }
      const data = {
        partcode: this.eqpTable.partcode, //  产品编码
        routecode: this.eqpTable.routecode, //  工艺路线编码