2024-10-17

src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue

@@ -48,14 +48,14 @@ export default {
   data() {
     return {
       rules: {
-        detailProfitRate: [{required: true, pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
-        adjustPartCost: [{required: true, pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
-        adjustMachineCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
-        adjustFabricateCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
-        adjustLabourCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
-        adjustToolCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/,  message: ' ', trigger: ['change','blur']}],
-        detailManageCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/,  message: ' ', trigger: ['change','blur']}],
-        detailOtherCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
+        detailProfitRate: [{required: true, message: ' ', trigger: ['change','blur']}],
+        adjustPartCost: [{required: true, message: ' ', trigger: ['change','blur']}],
+        adjustMachineCost: [{required: true,message: ' ', trigger: ['change','blur']}],
+        adjustFabricateCost: [{required: true, message: ' ', trigger: ['change','blur']}],
+        adjustLabourCost: [{required: true, message: ' ', trigger: ['change','blur']}],
+        adjustToolCost: [{required: true,  message: ' ', trigger: ['change','blur']}],
+        detailManageCost: [{required: true,  message: ' ', trigger: ['change','blur']}],
+        detailOtherCost: [{required: true, message: ' ', trigger: ['change','blur']}],
         taxRate: [{required: true,  message: ' ', trigger: ['change','blur']}],
       },
       quotationDetailColumns: [
@@ -142,9 +142,11 @@ export default {
       this.copyDetail.computeToolCost = new Decimal(this.copyDetail.computeToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
       this.copyDetail.adjustToolCost = new Decimal(this.copyDetail.adjustToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
       // 其他成本
-      this.copyDetail.detailOtherCost = new Decimal(new Decimal(new Decimal(this.shippingCost).add(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
       this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
       this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
+
+      this.copyDetail.detailOtherCost = new Decimal(this.copyPackCost).add(new Decimal(this.copyShippingCost)).toNumber()
+
       // 管理成本
       if (!this.copyDetail.detailManageCost){
         this.copyDetail.detailManageCost = 0;

src/views/modules/quotation/toBeQuoted.vue

@@ -87,7 +87,7 @@
 
     <!-- 报价列表 -->
     <el-table
-      :height="defaultFlag?700:300"
+      :height="defaultFlag?'76vh':300"
       :data="dataList"
       border
       v-loading="dataListLoading"

src/views/modules/test/testSoBom/testTable.vue

@@ -726,8 +726,8 @@ export default {
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="!testSoBom.itemNo" @click="saveTestSoBomBtn(true)">应 用</el-button>
-        <el-button type="primary" @click="saveTestSoBomBtn(false)">确 定</el-button>
+        <el-button type="primary" v-if="!testSoBom.itemNo" @click="saveTestSoBomBtn(true)">保 存</el-button>
+        <el-button type="primary" @click="saveTestSoBomBtn(false)">保存并关闭</el-button>
         <el-button @click="saveOrUpdateFlag = false">取 消</el-button>
       </span>
     </el-dialog>

src/views/modules/test/testSoRouting/testRoutingTable.vue

@@ -769,8 +769,8 @@ export default {
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button v-if="saveStatus" type="primary" @click="saveTestSoRouting(true)">应 用</el-button>
-        <el-button type="primary" @click="saveTestSoRouting(false)">确 定</el-button>
+        <el-button v-if="saveStatus" type="primary" @click="saveTestSoRouting(true)">保 存</el-button>
+        <el-button type="primary" @click="saveTestSoRouting(false)">保存并关闭</el-button>
         <el-button @click="saveFlag = false">取 消</el-button>
       </span>
     </el-dialog>