修改达沃特采购计划 代理订单 货代 船名 授权用户 陆运报表 轮胎商城 保留两位小数

src/views/businessManagement/proxyOrder/detailsPageEdit.vue

@@ -24,20 +24,16 @@
             <el-dropdown-item v-if="form.status == 3" :disabled="detailData.seeDisabled || form.specialCheckStatus > 0" @click.native="arrearsPleaseCheck">欠款发货审批</el-dropdown-item> -->
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown style="margin-right: 8px;">
+        <!-- <el-dropdown style="margin-right: 8px;">
           <el-button type="warning" size="small" :loading="saveLoading">
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <!--            <el-dropdown-item-->
-            <!--              :disabled="detailData.seeDisabled || form.status != 3"-->
-            <!--              @click.native="applySettlement('收费')">生成账单-->
-            <!--            </el-dropdown-item>-->
             <el-dropdown-item @click.native="openApplicationDialog" :disabled="!form.id">查看账单
             </el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
-        <el-dropdown style="margin-right: 8px;">
+        </el-dropdown> -->
+        <!-- <el-dropdown style="margin-right: 8px;">
           <el-button type="success" :loading="saveLoading" size="small">
             业务处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -48,7 +44,7 @@
             <el-dropdown-item :disabled="detailData.seeDisabled || !this.form.id"
               @click.native="copyOrder">复制单据</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown> -->
         <el-button class="el-button--small-yh" type="primary" :disabled="disabled || detailData.seeDisabled"
           :loading="saveLoading" size="small" @click="editCustomer(false)">保 存
         </el-button>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2016,9 +2016,10 @@ export default {
         return this.$message.error('请选择仓库')
       }
       this.dialogVisibleDL = !this.dialogVisibleDL
-      this.tableData = []
       this.commodityData = false
       this.DLListSave = [];
+      this.DLListShow = [];
+      this.policyType = null
       getAgencyOrder().then(res => {
         this.dataDL = res.data.data
       })
@@ -2538,9 +2539,23 @@ export default {
         }
       }
     },
-    getImportDL() {
+    async importDL() {
+      if (this.DLListSave.length == 0) {
+        return this.$message.error('请选择采购计划明细')
+      }
       this.saveLoading = true;
       for (let item in this.DLListSave) {
+        if (this.policyType) {
+            detailList(this.policyType).then(res => {
+              if (res.data.data.specialItemList) {
+                res.data.data.specialItemList.forEach(e => {
+                  if (this.DLListSave[item].code == e.code) {
+                    this.$set(this.DLListSave[item], 'price', e.salesPrice);
+                  }
+                })
+              }
+            })
+          }
         getMarketPrice({
           code: this.DLListSave[item].code,
           isFreight: this.form.isFreight,
@@ -2609,7 +2624,6 @@ export default {
           delete this.DLListSave[item].updateUser
           delete this.DLListSave[item].updateUserName
           this.maxGoodsNum++
-
           getPurchasePrice({ code: this.DLListSave[item].code }).then(res => {
             if (res.data.data.length > 0) {
               this.$set(this.DLListSave[item], 'purchaseAmount', res.data.data[0].purchasePrice)
@@ -2618,6 +2632,7 @@ export default {
               this.$set(this.DLListSave[item], 'purchaseAmount', '0')
             }
             this.quantityChange(this.DLListSave[item])
+            console.log(this.DLListSave[item].price,222222)
             this.$refs.crudContact.rowCellAdd(this.DLListSave[item]);
             this.$nextTick(() => {
               this.quantityChange(this.DLListSave[item])
@@ -2627,29 +2642,6 @@ export default {
       }
       this.saveLoading = false;
       this.dialogVisibleDL = false
-    },
-    importDL() {
-      if(this.DLListSave.length==0){
-        return this.$message.error('请选择采购计划明细')
-      }
-      if (this.policyType) {
-        this.loadingPolicy = true
-        detailList(this.policyType).then(res => {
-          if (res.data.data.specialItemList) {
-            res.data.data.specialItemList.forEach(item => {
-              this.DLListSave.forEach(e => {
-                if (item.code == e.code){
-                  this.$set(e, 'price', item.salesPrice);
-                }
-              })
-            })
-          }
-        }).finally(() => {
-          this.loadingPolicy = false;
-        })
-      } else {
-        this.getImportDL()
-      }
 
     },
     goodsListSaveHandle() {
@@ -2838,8 +2830,6 @@ export default {
       this.activeName = "searchList";
     },
     closeDL() {
-      this.DLListShow = [];
-      this.DLListSave = [];
       this.activeName = "searchList";
     },
     closeFees() {

src/views/iosBasicData/AirtransportExport/bills/assembly/reports.vue

@@ -196,6 +196,7 @@
               type:'tree',
               dicUrl: "/api/blade-user/userListAll",
               multiple: true,
+              overHidden: true,
               props: {
                 label: "realName",
                 value: "id"

src/views/iosBasicData/AirtransportImport/bills/assembly/reports.vue

@@ -196,6 +196,7 @@
               type:'tree',
               dicUrl: "/api/blade-user/userListAll",
               multiple: true,
+              overHidden: true,
               props: {
                 label: "realName",
                 value: "id"

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -937,6 +937,11 @@ export default {
                     this.$set(this.assemblyForm, 'vesselCnName', '')
                     this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
+                if (this[name + 'Data'].length == 0) {
+                    this.$set(this.assemblyForm, 'vesselId', value)
+                    this.$set(this.assemblyForm, 'vesselCnName', value)
+                    this.$set(this.assemblyForm, 'vesselEnName', value)
+                }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
                         this.$set(this.assemblyForm, 'vesselId', item.id)

src/views/iosBasicData/OceanFreightImport/bills/assembly/reports.vue

@@ -197,6 +197,7 @@
               type:'tree',
               dicUrl: "/api/blade-user/userListAll",
               multiple: true,
+              overHidden: true,
               props: {
                 label: "realName",
                 value: "id"

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -768,8 +768,10 @@
                                     autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="请输入危险品类别"></el-input> -->
                                 <dic-select v-model="assemblyForm.dgImdgCode" placeholder="危险品类别" key="dictKey"
-                                    label="dictKey" keyValue="dictKey" url="/blade-system/dict-biz/dictionary?code=dg_imdg_code"
-                                    :filterable="true" :disabled="detailData.seeDisabled" rightLabel="dictValue" :slotRight="true"></dic-select>
+                                    label="dictKey" keyValue="dictKey"
+                                    url="/blade-system/dict-biz/dictionary?code=dg_imdg_code" :filterable="true"
+                                    :disabled="detailData.seeDisabled" rightLabel="dictValue"
+                                    :slotRight="true"></dic-select>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -906,7 +908,7 @@ export default {
             default: false
         }
     },
-    components: { bcorps, SearchQuery, precontainers, bcorpstypedefine,dicSelect },
+    components: { bcorps, SearchQuery, precontainers, bcorpstypedefine, dicSelect },
     data() {
         return {
             loading: false,
@@ -1278,6 +1280,11 @@ export default {
                     this.$set(this.assemblyForm, 'vesselCnName', '')
                     this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
+                if (this[name + 'Data'].length == 0) {
+                    this.$set(this.assemblyForm, 'vesselId', value)
+                    this.$set(this.assemblyForm, 'vesselCnName', value)
+                    this.$set(this.assemblyForm, 'vesselEnName', value)
+                }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
                         this.$set(this.assemblyForm, 'vesselId', item.id)
@@ -1302,7 +1309,7 @@ export default {
                         this.$set(this.assemblyForm, 'carrierEnName', item.enName)
                         this.$set(this.assemblyForm, 'carrierCode', item.code)
                         this.$set(this.assemblyForm, 'carrierArgreementNo', item.carrierArgreementNo)
-                        
+
                     }
                 }
             }

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1684,7 +1684,7 @@ export default {
             } else {
                 // 往来单位拿主表客户名称
                 obj.corpId = this.assemblyForm.corpId
-                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpCnName = this.assemblyForm.corpCnName
                 obj.corpEnName = this.assemblyForm.corpEnName
                 //
                 // 预付/到付

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -201,6 +201,7 @@
               type:'tree',
               dicUrl: "/api/blade-user/userListAll",
               multiple: true,
+              overHidden: true,
               props: {
                 label: "realName",
                 value: "id"

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -14,9 +14,11 @@
           @click="backToList(2)">返回台账
         </el-button>
       </div>
-      <div v-if="roleNameTwo != '平台,调度派单'">
+      <div>
         <div class="el-button&#45;&#45;small-yh add-customer-btn">
-          <el-button type="warning" size="small" @click="updateFee">更新账单</el-button>
+          <el-button type="info" icon="el-icon-printer" size="small" @click.stop="openReport()">派车通知
+          </el-button>
+          <el-button v-if="roleNameTwo != '平台,调度派单'" type="warning" size="small" @click="updateFee">更新账单</el-button>
         </div>
       </div>
     </div>
@@ -62,8 +64,8 @@
     </basic-container>
     <containerTitle title="起止地信息"></containerTitle>
     <basic-container>
-      <el-table ref="singleTable" :data="tableData" size="mini" :header-cell-style="{ color: '#000', background: '#fafafa' }"
-        style="width: 100%">
+      <el-table ref="singleTable" :data="tableData" size="mini"
+        :header-cell-style="{ color: '#000', background: '#fafafa' }" style="width: 100%">
         <el-table-column property="date" align="center" width="40">
           <template slot-scope="scope">
             <span v-if="scope.$index == 0">
@@ -133,7 +135,8 @@
         <!--          <span v-else>{{ row.fleetName }}</span>-->
         <!--        </template>-->
         <template slot-scope="{row,index}" slot="menu">
-          <el-button type="text" size="small" v-if="row.status === 0" @click="rowSaveT(row, index)">{{ row.$cellEdit ? '保 存'
+          <el-button type="text" size="small" v-if="row.status === 0" @click="rowSaveT(row, index)">{{ row.$cellEdit ?
+            '保 存'
             : '修 改' }}
           </el-button>
           <el-button size="small" type="text" @click="designate(row, index)" v-if="row.status === 0">调 度
@@ -147,7 +150,8 @@
           </el-button>
           <el-button size="small" type="text" @click="annexOpen(row, index)">附 件
           </el-button>
-          <el-button type="text" size="small" v-if="row.status === 0" @click="rowSaveThree(row, index)">{{ row.$cellEdit ?
+          <el-button type="text" size="small" v-if="row.status === 0" @click="rowSaveThree(row, index)">{{ row.$cellEdit
+            ?
             '确认调度派车' : '调度派车' }}
           </el-button>
         </template>
@@ -256,8 +260,8 @@
           v-if="!(roleNameTwo.indexOf('调度中心业务员') !== -1 || roleNameTwo.indexOf('调度中心经理') !== -1)"></el-tab-pane>
         <el-tab-pane label="应付" name="2"></el-tab-pane>
       </el-tabs>
-      <avue-crud v-if="activeIndex === '1'" :data="collectionList" :key="key" :option="collectionOption" ref="collection"
-        @resetColumn="resetColumnCollection" @saveColumn="saveColumnCollection"
+      <avue-crud v-if="activeIndex === '1'" :data="collectionList" :key="key" :option="collectionOption"
+        ref="collection" @resetColumn="resetColumnCollection" @saveColumn="saveColumnCollection"
         @row-save="(row, done, loading) => { rowSave(row, 0, done, loading) }" @row-update="rowSave" @row-del="makeDel">
         <template slot-scope="{row}" slot="corpId">
           <crop-select v-if="row.$cellEdit" v-model="row.corpId"
@@ -286,8 +290,8 @@
           </el-button>
         </template>
         <template slot="menuLeft">
-          <el-button v-if="roleNameTwo.indexOf('总调度') === -1" type="primary" icon="el-icon-plus" @click="addRowCollection"
-            size="small">录入明细
+          <el-button v-if="roleNameTwo.indexOf('总调度') === -1" type="primary" icon="el-icon-plus"
+            @click="addRowCollection" size="small">录入明细
           </el-button>
         </template>
       </avue-crud>
@@ -374,6 +378,8 @@
         <el-button type="primary" @click="saveAnnex" size="small">保 存</el-button>
       </span>
     </el-dialog>
+    <report-dialog :switchDialog="switchDialog" :reportId="goodsForm.id" reportName="陆运-派车通知" @onClose="onClose()">
+    </report-dialog>
     <track-playback :dialogVisible="dialogVisibleTwo" :lineArr="lineArr" ref="playback"></track-playback>
   </div>
 </template>
@@ -398,7 +404,7 @@ import website from "@/config/website";
 import { getDeptTree } from "@/api/system/dept";
 import { customerList } from "@/api/basicData/basicFeesDesc";
 import { gaude, location } from "@/api/gaude";
-
+import reportDialog from "@/components/report-dialog/main";
 export default {
   props: {
     id: {
@@ -408,8 +414,12 @@ export default {
       type: Boolean
     }
   },
+  components: {
+    reportDialog
+  },
   data() {
     return {
+      switchDialog: false,
       formData: {},
       enclosure: false,
       dialogVisibleTwo: false,
@@ -1441,6 +1451,12 @@ export default {
     this.KeyBoxTwo++
   },
   methods: {
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
+    },
     updateFee() {
       const loading = this.$loading({
         lock: true,

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -442,7 +442,7 @@ export default {
                 orderItemsList: [],
                 paymentRecordsList: [],
                 outboundRecordsList: [],
-                freight:5,
+                freight: 5,
             },
             excelOption: {
                 submitBtn: false,
@@ -2257,7 +2257,7 @@ export default {
                         return
                     }
                     for (let i in this.form.orderItemsList) {
-                        this.form.orderItemsList[i].subTotalMoney = this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price
+                        this.form.orderItemsList[i].subTotalMoney = Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price)?Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price).toFixed(2):0
                         if (this.form.orderItemsList[i].pid) {
                         } else {
                             if (this.form.orderItemsList[i].whether == '1') {
@@ -2269,7 +2269,6 @@ export default {
                             } else {
                             }
                         }
-
                         if (this.form.orderItemsList[i].goodsNum <= 0) {
                             this.$message.warning(`销售明细序号${Number(i) + 1}的数量不能为零`);
                             picihao = true
@@ -2463,7 +2462,7 @@ export default {
 
                 this.form.orderItemsList.forEach((items) => {
                     if (!items.subTotalMoney) {
-                        items.subTotalMoney = items.goodsNum * items.price
+                        items.subTotalMoney = Number(items.goodsNum * items.price)?Number(items.goodsNum * items.price).toFixed(2):0
                         items.grossProfit = items.subTotalMoney - items.costprie
                     }
                     // let brandName = items.brandId
@@ -2610,7 +2609,7 @@ export default {
 
                 this.form.orderItemsList.forEach((items) => {
                     if (!items.subTotalMoney) {
-                        items.subTotalMoney = items.goodsNum * items.price
+                        items.subTotalMoney = Number(items.goodsNum * items.price)?Number(items.goodsNum * items.price).toFixed(2):0
                         items.grossProfit = items.subTotalMoney - items.costprie
                     }
                 })