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

廖井涛

4 天以前 df77398cbdc4a43e2b0a79a34aca42eb7e194e7b

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

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

@@ -168,9 +168,9 @@
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" colspan="4">
          客户名称：<span>{{ data.order.customerName }}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" v-if="data.order.batch!==''" colspan="3">
          项目名称：<span>{{ data.order.project }}({{data.order.batch}})</span></th>
          项目名称：<span style="font-size: 17px;white-space:nowrap;font-weight: bold;">{{ data.order.project }}({{data.order.batch}})</span></th>
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" v-else colspan="3">
          项目名称：<span>{{ data.order.project }}</span></th>
          项目名称：<span style="font-size: 17px;white-space:nowrap;font-weight: bold;">{{ data.order.project }}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" colspan="2">
          发货日期：<span>{{ data.order.deliveryDate }}</span></th>
      </tr>
@@ -239,7 +239,7 @@
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">
              <td style="text-align: left;border-width: 0 0 0 0; border-style: solid; border-color: #d3dce6" colspan="9">
              <td  style="text-align: left;border-width: 0 0 0 0; border-style: solid; border-color: #d3dce6;font-size: 17px;white-space:nowrap;font-weight: bold;" colspan="9">
                <template v-for="(item,index) in data.order.processingNote.split('\n')">
                  {{item}}
                  <br>

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

@@ -368,7 +368,7 @@
          fileJson.value= JSON.parse(res.data.data.file_json)
          selectData(fileJson.value)
        }else{
          return 
          return
        }
        const byteCharacters = atob(b64Data);
        const parser = new DxfParser();

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -151,7 +151,7 @@
        break
      }
      case 'hollow' :{
        productName+='*'+item.detail+"*"
        productName+=company.hollow+item.detail+company.hollow
        break
      }
    }