Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-12-17 6752d494350ac67e24769ed8c80c76260c68b226

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

@@ -42,7 +42,7 @@
  },

  columns:[
    {type: 'seq', title: t('basicData.Number'), width: 80 },
    {field: 'orderNumber', title: t('basicData.Number'), width: 80 },
    {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},

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

@@ -86,7 +86,7 @@
        item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
      })
      gridOptions.mergeCells= res.data.mergeCells
      //gridOptions.mergeCells= res.data.mergeCells
      xGrid.value.loadData(res.data.data)
    } else {
      ElMessage.warning(res.msg)

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

@@ -142,7 +142,7 @@
      <tr class="title-s">
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3 >生成任务单(成品)</h3>
          <h3 >生产任务单(成品)</h3>
        </th>
        <th colspan="2" style="width: 30%;">订单编号：<span>{{ data.order.orderId }}</span></th>
      </tr>

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

@@ -143,9 +143,9 @@
  <div id="printFlowCard" >
    <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >

      <div class="row1" v-if="item.heat_layout_id!=null">
      <div class="row1" v-if="item.heat_layout_id!==null">

        <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
        <div class="cell" v-if="item.heat_layout_id!==null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.process.includes('夹胶')">胶片</span>