1.字体引入研究2.节拍工价、工单新增控制必须设置计件单价

loulijun2021

2023-03-03 0fe5b8389c7025ce34a05d3920d1d6c169f9fea7

1.字体引入研究2.节拍工价、工单新增控制必须设置计件单价

 src/api/scgl.js

@@ -375,3 +375,12 @@
    params: data
  })
}

// å·¥å•æ´¾å‘选择工艺路线或选择生产车间时判断绑定条件
export function SelectRouteOrWkshop(data) {
  return request({
    url: 'ProductionManagement/SelectRouteOrWkshop',
    method: 'get',
    params: data
  })
}

 src/styles/font.css

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
@font-face {
  /*重命名字体名*/
  font-family: 'font';
  /*引入字体*/
  src: url('font.ttf');
  font-weight: normal;
  font-style: normal;
}

 src/styles/font.ttf

Binary files differ

 src/views/bbgl/rygz.vue

@@ -199,7 +199,7 @@
              </el-table-column>
              <el-table-column
                prop="ratio"
                label="工序单价"
                label="分配比例"
                width="110"
                sortable="custom"
              >

 src/views/scgl/gd.vue

@@ -610,6 +610,7 @@
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.routecode===''"
              @change="wkshopcodeChange"
            >
              <el-option
                v-for="item in wkshopArr"
@@ -743,11 +744,21 @@
        <div class="footerButton">
          <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 +1672,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 +1917,8 @@
        disabledDate(time) {
          return time.getTime() < Date.now() - 8.64e7
        }
      }
      },
      sumbitBottonIsDisabled: false
    }
  },
  created() {
@@ -2041,6 +2053,8 @@
      }

      this.dialogForm.wkshopcode = ''

      this.sumbitBottonIsDisabled = false
    },
    // å·¥è‰ºè·¯çº¿å€¼æ”¹å˜
    async routecodeChange(val) {
@@ -2053,6 +2067,21 @@
      this.wkshopArr = res2
      this.dialogForm.wkshopcode = ''
    },
    // ç”Ÿäº§è½¦é—´å€¼æ”¹å˜æ—¶
    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
      })
    },

    // æ˜¯å¦æŽ’程值改变时
    changeIsAps(val) {
      if (val === 'N') {
@@ -2214,6 +2243,7 @@

      this.bomIdArr = []
      this.$refs.dialogForm.clearValidate()
      this.sumbitBottonIsDisabled = false
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {

 src/views/xtsz/mmxg.vue

@@ -231,7 +231,7 @@
<!--import elDragDialog from '@/directive/el-drag-dialog'-->
<!--import waves from '@/directive/waves'-->
<!--import TableColumnSettings from '@/components/TableColumnSettings'-->

<!--import '../../styles/font.css'-->
<!--export default {-->
<!--  name: 'Zzjg',-->
<!--  components: {-->
@@ -429,7 +429,7 @@
<!--        // background: '#a7a7a7', padding: '0'-->
<!--        background: '#f8f8fa',-->
<!--        padding: '10px 0',-->
<!--        // fontFamily: 'SimHei',-->
<!--        fontFamily: 'font',-->
<!--        // margin: '3px 0',-->
<!--        color: '#bfc3c8',-->
<!--        fontWeight: 600-->
@@ -442,14 +442,16 @@

<!--    cellStyle() {-->
<!--      const option = {-->
<!--        // fontFamily: 'SimHei',-->
<!--        fontFamily: 'font',-->
<!--        // padding: '5px 0'-->
<!--        // fontFamily: 'sans-serif',-->
<!--        // fontFamily: 'Rubber cover glass BL-04',-->
<!--        // fontWeight: 'bold',-->
<!--        // fontWeight: 550,-->
<!--        // fontWeight: 'normal',-->
<!--        fontWeight: 500,-->

<!--        color: '#706f6f'-->
<!--        // color: '#706f6f'-->

<!--        color: '#29262e'-->
<!--        // color: `rgb(51, 54, 57)`-->

<!--      }-->

 src/views/zzmx/jpgj.vue

@@ -711,6 +711,10 @@
    },
    // ä¿å­˜è¡Œ
    async saveRow(row) {
      if (parseFloat(row.unprice) <= 0) {
        return this.$message.info('计件单价必须大于零！')
      }

      const data = {
        partcode: this.eqpTable.partcode, //  äº§å“ç¼–码
        routecode: this.eqpTable.routecode, //  å·¥è‰ºè·¯çº¿ç¼–码