Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-06-25 5545a0d9d5a33592591ba2089d4c095356bdba09

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -16,25 +16,26 @@
  {column:'height',title:null}
])
const order = ref({
  orderId:'order',
  project:'order',
  orderType:'order',
  customers:'order',
  icon:'order',
  orderClassify:'order',
  packType:'order',
  deliveryDate:'order',
  batch:'order',
  calculateType:'order',
  salesman:'order',
  alType:'order',
  money:'order',
  orderId:'order.orderId',
  project:'order.project',
  orderType:'order.orderType',
  customerName:'order.customers',
  icon:'order.icon',
  orderClassify:'order.orderClassify',
  packType:'order.packType',
  deliveryDate:'order.deliveryDate',
  batch:'order.batch',
  salesman:'order.salesman',
  alType:'order.alType',
  money:'order.money',
  contractId:'order',
  customerBatch:'order',
  contacts:'order',
  contactNumber:'order',
  deliveryAddress:'order',
  processingNote:'order',
  verifier:'order',
  productName:'order.orderDetail',
})

const tags = ref([])
@@ -182,7 +183,7 @@
            <el-select :placeholder="$t('components.orderHeader')">
              <el-option @click="addList(keys,item)"
                         v-for="(item,keys,index) in order"
                         :label="$t(item+'.'+keys)" :value="keys"/>
                         :label="$t(item)" :value="keys"/>

            </el-select>


 north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue

@@ -33,7 +33,7 @@

  columns:[
    {type: 'seq', title: t('basicData.Number'), width: 80 },
    {field: 'buildingNumber',width:120,  title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'buildingNumber',width:120,  title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    //{field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -202,7 +202,7 @@
        levelTwo:'Второй уровень',
        orderDetailsReport:'Отчет о деталях заказа',
        orderDetailsSummaryReport:'Сводный отчет о заказах',
        floorNumber:'Номер этажа',
        buildingNumber:'Номер этажа',
        saveHeader:'Изменить заголовок таблицы',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -147,7 +147,7 @@
        project:'项目名称',
        orderId:'销售单号',
        money:'总金额',
        customers:"客户选择",
        customers:"客户信息",
        deliveryDate:"交货日期",
        contractId:'合同编号',
        orderType:'订单类型',
@@ -202,7 +202,7 @@
        levelTwo:'产品小类',
        orderDetailsReport:'订单明细报表',
        orderDetailsSummaryReport:'订单明细汇总报表',
        floorNumber:'楼层编号',
        buildingNumber:'楼层编号',
        saveHeader:'保存表头',
        msg:{
            productCheck:'请选择产品',

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -207,7 +207,7 @@
    {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
    {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
    {field: 'thickness', title: t('processCard.glassThickness'), width: '60px'},
    {field: 'weight', title: t('processCard.weight')}
    {field: 'weight', title: t('processCard.weight'),slots:{default:'weight_sum'}}
  ],//表头按钮

  toolbarConfig: {
@@ -681,6 +681,10 @@
  },

}
const weightSum =  (row) =>{
    return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
}

</script>

<template>
@@ -739,6 +743,7 @@
            </template>



          </vxe-grid>

        </el-aside>
@@ -785,6 +790,9 @@
                  </li>
                </ul>
              </template>
              <template #weight_sum="{ row }">
                <span>{{ weightSum(row) }} </span>
              </template>

              <template #num1_filter="{ column, $panel }">
                <div>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue

@@ -136,7 +136,9 @@

/*成*/
.printFlowCard_finished {
  /*
  font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;
  */
  flex-wrap: wrap;
  font-size: 12pt;
  display: flex;
@@ -149,6 +151,7 @@
  display: flex;
  text-align: center;
  flex-direction:column;
  margin-left: 10px;
  width: 100%;
  height: 100%;

@@ -191,6 +194,7 @@
.row4{
  font-weight: bolder;
  text-align: right;
  margin-right: 10px;
}

.row1,.row2{
@@ -201,7 +205,7 @@

@page {
  size: auto;  /* auto is the initial value */
  margin: 13mm 0mm 0mm 6mm;  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 6mm;  /* this affects the margin in the printer settings */
}

@media print {

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue

@@ -107,7 +107,11 @@
          <div class="row2">{{ item1.order[item.name] }}</div>

        </div>
        <div class="row3"><label>W:</label>{{ item1.width }} <label>H:</label>{{ item1.height }}</div>
        <div class="row3">
          <label>W:{{ item1.width }}</label>
          &nbsp;&nbsp;
          <label>H:{{ item1.height }}</label>
        </div>

    </div>
  </div>
@@ -122,6 +126,8 @@

body{
  overflow: hidden;
  font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;

}

#printButton {
@@ -175,6 +181,7 @@

.row1,.row2{
  text-align: left;
  font-weight: bolder;
}

@page {

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue

@@ -106,7 +106,7 @@
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td colspan="24">
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div>常州市吉利玻璃有限公司</div>
          <div>天津北方玻璃技术股份有限公司</div>
          <div>生产流程卡</div>
          <div style="text-align: right;font-weight: bolder">流程卡号： {{
              itemFlow.process_id
@@ -228,25 +228,6 @@
        <td></td>
        <td></td>
      </tr>
<!--      <tr>-->
<!--        <td>接受签名</td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--        <td></td>-->
<!--      </tr>-->
      <tr>
        <td>生产日期</td>
        <td></td>
@@ -285,33 +266,10 @@
        <td></td>
        <td></td>
      </tr>
      <!--      <tr>-->
      <!--        <td>架子编号</td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--        <td></td>-->
      <!--      </tr>-->
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td rowspan="2">
          <div class='qrCode' style="width: 80px;height: 80px;">
            <img :src= qrCodeItem.qrcode>
<!--            {{-->
<!--              getUrl(qrCodeItem.process_id)-->
<!--            }}-->

          </div>

        </td>

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue

@@ -56,7 +56,7 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 10)
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10) //默认开始时间7天前

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -82,6 +82,11 @@

})

/*onMounted(() => {
  //启用表格拖动选中
  addListener(xGrid.value, gridOptions)
})*/

let inputDisabled = ref(false)
onMounted(() =>{
  if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
@@ -172,7 +177,37 @@
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  },
  /*menuConfig: {
    body: {
      options: [
        [
          {
            code: 'copyChecked',
            name: t('basicData.selectSame'),
            prefixIcon: 'vxe-icon-copy',
            visible: true,
            disabled: false
          },
          {
            code: 'copyAll',
            name: t('basicData.sameAfterwards'),
            prefixIcon: 'vxe-icon-feedback',
            visible: true,
            disabled: false
          },
          {
            code: 'clearChecked',
            name: t('basicData.clearSelection'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
  },*/
  //表头参数
  columns: [
    //  {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {
@@ -359,7 +394,59 @@
    //改变brokenVisible的值触发openedBrokenTable（）方法
    brokenVisible.value = true

  }
  },
  /*menuClick({menu, row, column}) {
    const $grid = xGrid.value
    if ($grid) {
      switch (menu.code) {
        case 'copyChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                }
              })
            }
          }

          break
        }
        case 'copyAll' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "completedQuantity" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start) {
                  item[result.cell] = val
                }
              })
            }
          }
          break
        }
        case 'clearChecked' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "completedQuantity" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = ''
                }
              })
            }
          }
          break
        }
      }
    }
  },*/
}


@@ -820,11 +907,13 @@
    ElMessage.warning(t('reportingWorks.selectProcess'))
    return
  }

  if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting') && titleSelectJson.value.thisProcessType !== "") {
    ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
    return
  if (titleSelectJson.value.thisProcessType.length!=0){
    if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting')) {
      ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
      return
    }
  }

  //匹配“/”前后字符串
  const regex =  /([^\/]+)\/([^\/]+)/;
  //查找匹配的字符串
@@ -1192,9 +1281,7 @@
          <!--     刺破类型breakageType   -->
          <template #breakageType="{ row }">
            <vxe-select v-model="row.breakageType "
                        filterable
                        clearable
                        placeholder="">
                        clearable placeholder=" " allow-create  filterable>
              <vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
            </vxe-select>
          </template>
@@ -1205,9 +1292,7 @@
          <!--次破原因-->
          <template #breakageReason="{ row }">
            <vxe-select v-model="row.breakageReason "
                        filterable
                        clearable
                        placeholder="">
                        clearable placeholder=" " allow-create  filterable>
              <vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
            </vxe-select>
          </template>

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -143,7 +143,7 @@
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'buildingNumber',width:120,  title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'buildingNumber',width:120,  title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'grossAmount',width:160,  title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -427,12 +427,6 @@
            )

            saveOrderTitle(order)






          }
          break
        }

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -637,8 +637,8 @@
                                                    od.order_number = fc.order_number
        where fc.process_id = #{processId}
        and fc.technology_number=#{technologyNumber}
       group by od.order_number,width,height

        group by od.order_number,width,height
        order by IF(fc.sort!=NULL||fc.sort!='',fc.sort,fc.order_number)
    </select>

    <select id="getPrintLabelCount">