大件调度详情打印

src/api/basicData/basicFeesDesc.js

@@ -113,3 +113,20 @@ export function shippingDelItem(data) {
     }
   })
 }
+
+// 工厂发货里的提交
+export function submitWagonNumber(data) {
+  return request({
+    url: '/api/blade-deliver-goods/delivery/submitWagonNumber',
+    method: 'post',
+    data: data
+  })
+}
+// 工厂发货里的撤销
+export function revokeWagonNumber(data) {
+  return request({
+    url: '/api/blade-deliver-goods/delivery/revokeWagonNumber',
+    method: 'post',
+    data: data
+  })
+}

src/views/SpecialTrade/dispatchingCars/detailPage.vue

@@ -290,6 +290,7 @@
                         size="small"
                         type="text"
                         @click="changeFleetT(row, index)"
+                        disabled=""
                         v-if="row.status !== 0 || row.status !==1 || row.status !==4"
                     >变 更
                     </el-button>

src/views/SpecialTrade/dispatchingCars/index.vue

@@ -210,7 +210,7 @@ export default {
                         width: 70,
                         search: true,
                     }, {
-                        label: '车型',
+                        label: '车型车数',
                         prop: 'ctnDetail',
                         overHidden: true,
                         index: 6,

src/views/SpecialTrade/driver/index.vue

@@ -314,7 +314,7 @@ export default {
             value: "dictValue"
           },
         }, {
-          label: '车量',
+          label: '车数',
           width: 58,
           index: 6,
           prop: 'ctnQuantity'

src/views/SpecialTrade/motorcadeDriver/index.vue

@@ -459,7 +459,7 @@ export default {
             value: "dictValue"
           }
         }, {
-          label: '车量',
+          label: '车数',
           width: 58,
           index: 6,
           overHidden: true,

src/views/SpecialTrade/placeAnOrder/detailPage.vue

@@ -42,7 +42,7 @@
               size="small"
               v-if="goodsForm.id"
               :disabled="
-            !((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
+            !((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1) || this.roleName.indexOf('大件调度') !== -1 ||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
               @click="generateBill"
           >生成账单
           </el-button>
@@ -50,8 +50,7 @@
               type="warning"
               size="small"
               v-if="goodsForm.status > 0"
-              :disabled="
-            !((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
+              :disabled="!((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1) || this.roleName.indexOf('大件调度') !== -1 ||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
@@ -1587,9 +1586,19 @@ export default {
       oldgoodsList:{},
       oldvehicleList:{},
       oldorderFilesList:{},
+        // 判断当前权限是否可以点击变更按钮
+        confirmdis:false
     };
   },
   async created() {
+      this.$nextTick(()=>{
+          let arr = localStorage.getItem('roleName').split(',')
+          if (arr.indexOf('admin') != -1 || arr.indexOf('大件调度') != -1) {
+              console.log('y')
+              this.confirmdis = true
+          }
+      })
+
     this.activeIndex = this.roleName.indexOf('调度中心业务员') !== -1 ? '2' : this.roleName.indexOf('调度中心经理') !== -1 ? '2' : '1'
     // this.entrustOptionTwo = await this.getColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
       this.entrustOptionTwo = this.entrustOptionTwoBackup

src/views/SpecialTrade/placeAnOrder/index.vue

@@ -297,7 +297,7 @@ export default {
             width: 70,
             search: true,
           }, {
-            label: '车型',
+            label: '车型车数',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,

src/views/SpecialTrade/reportAnalysis/index.vue

@@ -429,15 +429,22 @@ export default {
             width: 70,
             search: true,
           }, {
-            label: '箱型箱量',
+            label: '车型车量',
             width: 80,
             index: 8,
             overHidden: true,
             prop: 'ctnDetail'
-          }, {
+          },{
+                label: '货物名称',
+                overHidden: true,
+                index: 13,
+                width: 100,
+                prop: 'goods'
+            },
+            {
             label: '备注',
             overHidden: true,
-            index: 13,
+            // index: 13,
             width: 100,
             prop: 'remarks'
           }]

src/views/businessManagement/receipt/configuration/mainList.json

@@ -210,6 +210,22 @@
       "overHidden": true
     },
     {
+      "label": "车号1",
+      "prop": "wagonNumberOne",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "车号2",
+      "prop": "wagonNumberTwo",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "物流确认",
       "prop": "logisticsConfirm",
       "search": false,

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -8,7 +8,9 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button v-if="detailData.seeDisabled" size="small" @click="editHandle" type="primary">编 辑</el-button>
+          <el-button v-if="form.wagonNumberStatus == 1" size="small" @click="revokeWagonNumberfun" type="warning">撤销运输服务</el-button>
+          <el-button v-else :disabled="!form.wagonNumberOne" size="small" @click="submitWagonNumberfun" type="success">提交运输服务</el-button>
+        <el-button v-if="detailData.seeDisabled" :disabled="form.wagonNumberStatus == 1" size="small" @click="editHandle" type="primary">编 辑</el-button>
         <el-button type="primary" size="small" :disabled="!form.id" :loading="saveLoading"
           @click="postMessage">发送消息</el-button>
         <el-button class="el-button--small-yh" type="primary" @click="revokeInGoods" size="small"
@@ -88,7 +90,13 @@
                   :disabled="item.disabled || detailData.seeDisabled || receiveDisabled" v-model.trim="form[item.prop]" />
                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small"
                   autocomplete="off" :disabled="item.disabled || detailData.seeDisabled || receiveDisabled"></el-input>
-                <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off"
+
+                  <el-input v-else-if="item.prop == 'wagonNumberOne'" v-model.trim="form[item.prop]" size="small"
+                            autocomplete="off" :disabled="item.disabled"></el-input>
+                  <el-input v-else-if="item.prop == 'wagonNumberTwo'" v-model.trim="form[item.prop]" size="small"
+                            autocomplete="off" :disabled="item.disabled"></el-input>
+
+                  <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off"
                   :disabled="item.disabled || detailData.seeDisabled || receiveDisabled"></el-input>
               </el-form-item>
             </el-col>
@@ -233,7 +241,13 @@ import advantageProject from "./configuration/advantageProject.json"
 import bankOfDeposit from "./configuration/bankOfDeposit.json"
 import commodity from "./configuration/commodity.json"
 import optionTwoCost from "./configuration/mainListCost.json"
-import { getDeptLazyTree, customerList, getDeptLazyTreeTwo } from "@/api/basicData/basicFeesDesc";
+import {
+    getDeptLazyTree,
+    customerList,
+    getDeptLazyTreeTwo,
+    submitWagonNumber,
+    revokeWagonNumber
+} from "@/api/basicData/basicFeesDesc";
 import { customerList as wareHouseType } from "@/api/basicData/basicStorageType"
 import { customerList as selectWareHouse } from "@/api/basicData/basicStorageDesc"
 import { selectGoodsNum } from "@/api/basicData/inventoryAccount"
@@ -598,6 +612,23 @@ export default {
               }
             ]
           },
+            {
+                label: "车号1",
+                prop: "wagonNumberOne",
+                disabled: true,
+                rules: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            {
+                label: "车号2",
+                prop: "wagonNumberTwo",
+                disabled: true
+            },
           {
             label: "入库单备注",
             span: 24,
@@ -1384,11 +1415,11 @@ export default {
           // 计算 deliveryFeesList 中 amount 的总和
           // let totalAmount = 0;
           //   if(this.form.deliveryFeesList){
-          //     for(let i=0;i<this.form.deliveryFeesList.length;i++){ 
+          //     for(let i=0;i<this.form.deliveryFeesList.length;i++){
           //       totalAmount +=  this.form.deliveryFeesList[i].amount
           //     }
           // }
-          
+
           //计算费用明细
           // this.form.number = Number(this.form.purchaseAmount) + totalAmount
           console.log(this.form.number);
@@ -1523,8 +1554,8 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
+      // 编辑
     editHandle() {
-
       const data = {
         moduleName: 'sh',
         tableName: 'business_delivery',
@@ -1549,9 +1580,43 @@ export default {
       }).finally(() => {
         this.saveLoading = false
       })
-
+        this.findObject(this.basicData.column, "wagonNumberOne").disabled = false
+        this.findObject(this.basicData.column, "wagonNumberTwo").disabled = false
     },
-    returnBack(data) {
+      // 提交
+      submitWagonNumberfun(){
+          this.$confirm('是否要提交运输服务', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+          }).then(res=>{
+              submitWagonNumber(this.form).then(res=>{
+                  this.$message.success('提交运输服务成功');
+                  this.detailData.seeDisabled = true
+                  this.findObject(this.basicData.column, "storageId").disabled = true
+                  this.findObject(this.basicData.column, "wagonNumberOne").disabled = true
+                  this.findObject(this.basicData.column, "wagonNumberTwo").disabled = true
+                  this.queryData(this.form.id)
+              })
+          })
+      },
+      // 撤销
+      revokeWagonNumberfun(){
+          this.$confirm('是否要撤销运输服务', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+          }).then(res=>{
+              revokeWagonNumber(this.form).then(res=>{
+                  this.$message.success('撤销运输服务成功');
+                  // this.findObject(this.basicData.column, "storageId").disabled = true
+                  // this.findObject(this.basicData.column, "wagonNumberOne").disabled = true
+                  // this.findObject(this.basicData.column, "wagonNumberTwo").disabled = true
+                  this.queryData(this.form.id)
+              })
+          })
+      },
+      returnBack(data) {
       GYSDetail(data.id).then(res => {
         if (res.data.data.corpsAddrList.length > 0) {
           this.GYSInfo = res.data.data.corpsAddrList

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -304,6 +304,22 @@
       "overHidden": true
     },
     {
+      "label": "车号1",
+      "prop": "wagonNumberOne",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "车号2",
+      "prop": "wagonNumberTwo",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "公司户头",
       "prop": "banksAccountName",
       "search": false,

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -73,7 +73,8 @@
       "prop": "memberBalance",
       "overHidden": true,
       "width": 240,
-      "index": 7
+      "index": 7,
+      "hide": true
     },
     {
       "label": "本次金额",

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -85,7 +85,8 @@
             </el-select>
             <span v-else>{{ row.currency }}</span>
           </template>
-            <template slot-scope="{ row }" slot="memberBalance">
+
+            <template slot-scope="{ row }" slot="memberBalance" v-if="isProcurementfalse == 1">
                 <span v-if="row.$cellEdit" class="required_fields">*</span>
                 <el-input
                     v-if="row.$cellEdit"
@@ -100,6 +101,7 @@
                 <span v-if="row.$cellEdit" style="margin-left: 10px">余额：{{balanceAmounts}}</span>
                 <span v-else>{{ row.memberBalance }}</span>
             </template>
+
           <template slot="thisAmount" slot-scope="{ row }">
             <span v-if="row.$cellEdit" class="required_fields">*</span>
             <el-input v-if="row.$cellEdit" v-model="row.thisAmount"
@@ -135,7 +137,7 @@ import { getDetails, modify, cancelModify, saveOrEdit, deleteDetail  } from "@/a
 import { contrastObj, contrastList } from "@/util/contrastData";
 import billDetail from "@/components/bill/billDetailList";
 import { getlistBankBy } from "@/api/financialManagement/paymentRequest";
-import { getlistBankBy as GYSGetBank } from "@/api/basicData/configuration"
+import {getlistBankBy as GYSGetBank, isProcurement} from "@/api/basicData/configuration"
 import _ from "lodash";
 import { getUserInfo } from "@/api/system/user";
 import { getCorpDetail } from "@/api/maintenance/overpayment";
@@ -397,13 +399,22 @@ export default {
       allAmount: 0,
       editDisable: false,
         // 会员卡余额
-        balanceAmounts:0
+        balanceAmounts:0,
+        // 判断会员卡金额是否显示 1显示 0不显示
+        isProcurementfalse:0
     }
   },
   components: {
     billDetail,reportDialog
   },
   created() {
+      isProcurement({param:"whether.display.member"}).then(res=>{
+          this.isProcurementfalse = res.data.data
+          if (this.isProcurementfalse == 1) {
+              this.findObject(this.itemsOption.column, "memberBalance").hide = falses
+          }
+      })
+
     // 人民币金额默认为0
     this.$set(this.form, "amount", 0)
     getUserInfo().then(res => {

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -73,7 +73,8 @@
       "prop": "memberBalance",
       "overHidden": true,
       "width": 240,
-      "index": 7
+      "index": 7,
+      "hide": true
     },
     {
       "label": "本次金额",

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -90,7 +90,7 @@
                 <el-input-number v-model="form.memberBalance" disabled
                                  placeholder="请输入" size="small" :controls="false">
                 </el-input-number>
-                <span style="margin-left: 10px">余额：{{balanceAmounts}}</span>
+                <span style="margin-left: 5px">余额:{{balanceAmounts}}</span>
             </template>
           <template slot="remark">
             <el-input type="textarea"
@@ -140,7 +140,8 @@
             </el-select>
             <span v-else>{{ row.currency }}</span>
           </template>
-            <template slot-scope="{ row }" slot="memberBalance">
+
+            <template slot-scope="{ row }" slot="memberBalance" v-if="isProcurementfalse == 1">
                 <span v-if="row.$cellEdit" class="required_fields">*</span>
                 <el-input
                     v-if="row.$cellEdit"
@@ -155,6 +156,7 @@
                 <span v-if="row.$cellEdit" style="margin-left: 10px">余额：{{balanceAmounts}}</span>
                 <span v-else>{{ row.memberBalance }}</span>
             </template>
+
           <template slot="thisAmount" slot-scope="{ row }">
             <span v-if="row.$cellEdit" class="required_fields">*</span>
             <el-input
@@ -237,7 +239,7 @@
   import { contrastObj,contrastList } from "@/util/contrastData";
   import {getUserInfo} from "@/api/system/user";
   import {getCorpDetail} from "@/api/maintenance/overpayment";
-  import { getlistBankBy as GYSGetBank } from "@/api/basicData/configuration"
+  import {getlistBankBy as GYSGetBank, isProcurement} from "@/api/basicData/configuration"
   import reportDialog from "@/components/report-dialog/main";
   import {dateFormat} from "@/util/date";
   import {getCorpDetails} from "@/api/basicData/salesOrder";
@@ -505,10 +507,18 @@
         switchDialog: false,
         statementData: {},
           // 会员卡余额
-          balanceAmounts:0
+          balanceAmounts:0,
+          // 判断会员卡金额是否显示 1显示 0不显示
+          isProcurementfalse:0
       }
     },
     created() {
+        isProcurement({param:"whether.display.member"}).then(res=>{
+            this.isProcurementfalse = res.data.data
+            if (this.isProcurementfalse == 1) {
+                this.findObject(this.itemsOption.column, "memberBalance").hide = false
+            }
+        })
       // 人民币金额默认为0
       this.$set(this.form,"amount", 0)
       getUserInfo().then(res=>{

src/views/product/detailsPage.vue

@@ -288,7 +288,12 @@ export default {
                 controls: false,
                 disabled:true,
                 span: 8,
-                value:0
+                value:0,
+                rules: [{
+                    pattern:/^[+]{0,1}(\d+)$/,
+                    message:"必须为正整数",
+                    trigger:"blur"
+                }]
             },
             {
                 label: "推荐人积分",
@@ -298,7 +303,12 @@ export default {
                 controls: false,
                 disabled:true,
                 span: 8,
-                value:0
+                value:0,
+                rules: [{
+                    pattern:/^[+]{0,1}(\d+)$/,
+                    message:"必须为正整数",
+                    trigger:"blur"
+                }]
             },
             {
                 label: "业务员积分",
@@ -308,7 +318,12 @@ export default {
                 controls: false,
                 disabled:true,
                 span: 8,
-                value:0
+                value:0,
+                rules: [{
+                    pattern:/^[+]{0,1}(\d+)$/,
+                    message:"必须为正整数",
+                    trigger:"blur"
+                }]
             },
             {
                 label: "商品积分",
@@ -318,7 +333,12 @@ export default {
                 controls: false,
                 disabled:true,
                 span: 8,
-                value:0
+                value:0,
+                rules: [{
+                    pattern:/^[+]{0,1}(\d+)$/,
+                    message:"必须为正整数",
+                    trigger:"blur"
+                }]
             },
           {
             label: "备注",
@@ -410,7 +430,9 @@ export default {
       },
       goodsTypeList: [],
       unitList: [],
-      optionList: {}
+      optionList: {},
+        // admin 权限
+        roleNameqx:[]
     };
   },
   components: {
@@ -422,15 +444,6 @@ export default {
     }
   },
   async created() {
-      // 判断是否是admin 权限
-      let arr = localStorage.getItem('roleName').split(',')
-      if (arr.indexOf('admin') != -1) {
-          this.findObject(this.option.column, "storeIntegral").disabled = false
-          this.findObject(this.option.column, "referenceIntegral").disabled = false
-          this.findObject(this.option.column, "salesmanIntegral").disabled = false
-          this.findObject(this.option.column, "integral").disabled = false
-      }
-
     this.optionList = await this.getColumnData(
       this.getColumnName(218),
       optionList
@@ -444,6 +457,17 @@ export default {
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
+
+      // 判断是否是admin 权限
+      this.roleNameqx = localStorage.getItem('roleName').split(',')
+      let arr = localStorage.getItem('roleName').split(',')
+      if (arr.indexOf('admin') != -1 && this.form.whetherIntegral == 0) {
+          this.findObject(this.option.column, "storeIntegral").disabled = false
+          this.findObject(this.option.column, "referenceIntegral").disabled = false
+          this.findObject(this.option.column, "salesmanIntegral").disabled = false
+          this.findObject(this.option.column, "integral").disabled = false
+      }
+
     this.getAllWorkDicts()
   },
   methods: {
@@ -554,6 +578,26 @@ export default {
     },
       // 是否为积分商品的change事件
       whetherIntegralChange(val){
+          console.log(val,557)
+          if (this.form.whetherIntegral == 1) {
+              // disabled:true,
+              this.findObject(this.option.column, "storeIntegral").disabled = true
+              this.findObject(this.option.column, "referenceIntegral").disabled = true
+              this.findObject(this.option.column, "salesmanIntegral").disabled = true
+              this.findObject(this.option.column, "integral").disabled = true
+
+              // 四个售价变成正整数
+              this.findObject(this.option.column, "wholesalePrice").rules[0].pattern = /^[+]{0,1}(\d+)$/
+              this.findObject(this.option.column, "repairDepotPrice").rules[0].pattern = /^[+]{0,1}(\d+)$/
+              this.findObject(this.option.column, "storePrice").rules[0].pattern = /^[+]{0,1}(\d+)$/
+              this.findObject(this.option.column, "price").rules[0].pattern = /^[+]{0,1}(\d+)$/
+
+          }else if (this.form.whetherIntegral == 0 && this.roleNameqx.indexOf('admin') != -1) {
+              this.findObject(this.option.column, "storeIntegral").disabled = false
+              this.findObject(this.option.column, "referenceIntegral").disabled = false
+              this.findObject(this.option.column, "salesmanIntegral").disabled = false
+              this.findObject(this.option.column, "integral").disabled = false
+          }
 
       },
       // 是否管理批次号的change事件

src/views/salesOrder/detailsPage.vue

@@ -676,6 +676,7 @@ export default {
       if (row.cname) {
         this.goodsoptions.forEach(e => {
           if (e.cname == row.cname) {
+              console.log(e,679)
             row.itemId = e.id
             row.unit = e.unit
             // row.price = e.standardPrice
@@ -714,7 +715,9 @@ export default {
       })
     },
     countChange(row) {
+        console.log(row,718)
       row.amount = multiply(row.price, row.storageInQuantity)
+        console.log(multiply(row.price, row.storageInQuantity))
       row.storageAmount = multiply(row.purchaseAmount, row.storageInQuantity)
       let val = 0
       this.data.forEach(e => {

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -156,7 +156,7 @@ export default {
             overHidden: true,
           },
           {
-            label: '业务号',
+            label: '提单号',
             prop: 'billNo',
             index: 5,
             width: 140,
@@ -745,7 +745,7 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
         this.key++
-        if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1) {
+        if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('大件调度') !== -1) {
           for (let item of this.option.column) {
             if (item.prop === 'extraAmountC') return this.reset()
           }
@@ -979,11 +979,14 @@ export default {
       })
     },
     query(data) {
-        console.log(data)
       this.getsalesTrend(data)
     },
+      // 获取列表数据
     getsalesTrend(data = {status: 0, mold: 1}) {
-        console.log(data,968)
+        if (data.mold == 3) {
+            this.findObject(this.option.column, "billNo").label = "业务号"
+            this.findObject(this.option.column, "ctnDetail").label = "车型车数"
+        }
       this.mold = data.mold
       this.status = data.status
       this.loading = true;