north-glass-erp/northglass-erp/src/components/sd/order/PrintFoot.vue
@@ -13,7 +13,7 @@ </el-row> <el-row style="text-align: left "> <el-col :span="4">创建时间：{{props.order.createTime}}</el-col> <el-col :span="4">审核时间：</el-col> <el-col :span="4">审核时间：{{props.order.updateTime}}</el-col> <el-col :span="4">打印时间：</el-col> </el-row> </div> north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
@@ -131,7 +131,7 @@ <th class="title-1">订单类型</th> <th colspan="4">{{data.order.orderType}}</th> <th class="title-1">跟单员</th> <th colspan="3">{{data.order.creator}}</th> <th colspan="3">{{data.order.salesman}}</th> </tr> <tr> <th>磨边</th> north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -115,7 +115,7 @@ <th class="title-1">订单类型</th> <th colspan="4">{{data.order.orderType}}</th> <th class="title-1">跟单员</th> <th colspan="3">{{data.order.creator}}</th> <th colspan="3">{{data.order.salesman}}</th> </tr> <tr> <th>磨边</th> @@ -141,8 +141,7 @@ <th>半径</th> <th>楼号</th> <th>加工要求</th> <th>备注</th> <th>序号</th> <th colspan="2">备注</th> <th>备注1</th> <th>备注2</th> <th>备注3</th> @@ -168,8 +167,7 @@ <td>{{item1.bendRadius}}</td> <td>{{item1.buildingNumber}}</td> <td>{{item1.processingNote}}</td> <td>{{item1.remarks}}</td> <td></td> <td colspan="2">{{item1.remarks}}</td> <td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td> <td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td> <td>{{((item1.otherColumns?.S06)?item1.otherColumns.S06:'')}}</td> north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1207,7 +1207,7 @@ </el-col> <el-col :span="2"><el-text>{{$t('order.icon')}}：</el-text></el-col> <el-col :span="2"> <el-select v-model="titleUploadData.icon" clearable placeholder=" " allow-create filterable> <el-select v-model="titleUploadData.icon" clearable placeholder=" " allow-create filterable default-first-option> <el-option v-for="item in titleSelectJson['icon']" :key="item.id" :label="item.basicName" north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
@@ -214,7 +214,7 @@ let childName = '' try { Object.keys(hollowBasic.value).forEach((item, index) => { if (hollowBasic.value[item] === '') { if (hollowBasic.value[item] === '' && item !== 'GlueDepth') { throw new Error(t('product.msg.HollowReview')) } childName += hollowBasic.value[item] north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -66,7 +66,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(Arrays.toString(e.getStackTrace())); sysError.setFunc("saveOrder"); sysErrorService.insert(sysError); saveState = false;
