Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

package-lock.json

@@ -194,11 +194,6 @@
             "node-releases": "^1.1.71"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001230",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
-        },
         "electron-to-chromium": {
           "version": "1.3.742",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
@@ -7368,12 +7363,6 @@
         "lodash.uniq": "^4.5.0"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001164",
-      "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001164.tgz?cache=0&sync_timestamp=1606806154399&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001164.tgz",
-      "integrity": "sha1-W7/WTKYF1DEy8TzH/auxfDA2v9w=",
-      "dev": true
-    },
     "canvas-compress": {
       "version": "1.1.5",
       "resolved": "https://registry.npm.taobao.org/canvas-compress/download/canvas-compress-1.1.5.tgz",
@@ -8597,11 +8586,6 @@
             "node-releases": "^1.1.71"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001230",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
-        },
         "electron-to-chromium": {
           "version": "1.3.742",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
@@ -23206,4 +23190,4 @@
       "integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
     }
   }
-}
+}

src/views/contractManagement/acquisitionContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-      <!-- <div v-if="applstatus"> -->
+      <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
 </template>
@@ -304,6 +304,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',

src/views/contractManagement/collectionContract.vue

@@ -236,6 +236,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',

src/views/contractManagement/purchaseContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <!-- <div v-if="applstatus"> -->
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
 </template>
@@ -224,6 +224,7 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import { hasPermission } from '../../utils/getHasPermission'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -302,6 +303,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',
@@ -357,7 +362,9 @@
       }
     },
     activated() {
-      // this.applstatus=this.global.hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      
+      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      console.log(this.applstatus)
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/salesContract.vue

@@ -88,7 +88,7 @@
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
             @change='selectstatuschange($event,scope.row)'
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             :value="scope.row.status">
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
@@ -190,7 +190,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -202,14 +202,14 @@
     </el-pagination>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <!-- <div v-if="applstatus"> -->
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <el-dialog
     title="合同完成"
@@ -246,6 +246,7 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import { hasPermission } from '../../utils/getHasPermission'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -335,6 +336,10 @@
           {
             value: '未回款',
             type: 3,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',
@@ -545,7 +550,6 @@
       },
 
       getList() {
-        
         getList({
             compId: localStorage.getItem('ws-pf_compId'),
             contractType: this.contractType,

src/views/contractManagement/salesContractAdd.vue

@@ -1436,6 +1436,10 @@
             this.deptBudgetList.compId = this.compId
             this.deptBudgetList.contractType = 1
             this.deptBudgetList.goodsType = 1
+            if(this.deptBudgetList.priceType == "随行就市"){
+              delete this.deptBudgetList.unitContractPrice
+              delete this.deptBudgetList.totalContractPrice
+            }
             addList(this.deptBudgetList)
               .toPromise()
               .then((response) => {

src/views/contractManagement/storageContract.vue

@@ -222,6 +222,10 @@
             value: '已完成',
             type: 2,
           },
+          {
+            value: '审批中',
+            type: 4,
+          },
           {
             value: '全部合同',
             type: '',

src/views/houseSelfCollect/inspectInfo.vue

@@ -372,7 +372,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口
@@ -405,7 +405,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -2724,7 +2724,9 @@ export default {
                 }
                 // console.log(delete this.deptBudgetList.status)
               if (this.statusTypetext == '初检') {
-                
+                if(this.zjJurisdiction){
+                  this.deptBudgetList.outType=this.outType
+                }
                 
                 if(this.deptBudgetList.id){
                   this.deptBudgetList.id=kid

src/views/outboundManagement/weighingManagementNew.vue

@@ -156,7 +156,7 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <el-input :maxlength="'7'" v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+                        <el-input :maxlength="'7'" v-if="carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
                            size="small" :disabled="recheck1"/>
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange" :disabled="recheck1">
@@ -448,7 +448,7 @@
         tpyeNo: 1,
         types: null,
         information: '皮重',
-        carChange1: '识别下拉',
+        carChange1: '手动填写',
         inWarehouseType: 1, //入库类型
         outContractNo: [],
         mListTop: [],
@@ -466,7 +466,7 @@
         weighingList: {
           grossWeight: '',
           tare: '',
-          selfLoading: 1,
+          selfLoading: 0,
           buckleMiscellaneous: 0,
           netWeight: 0,
           weight: '',
@@ -1052,7 +1052,6 @@
               this.recheckPrice = false
             }
 
-            this.carstatus=false
             // this.weighingList.carNo =
               // response.qualityInspectionManagement.carNumber
         this.$set(this.weighingList,'carNo', response.qualityInspectionManagement.carNumber)
@@ -1580,7 +1579,7 @@
                   // this.isShowPrint = true
                   this.weighingList = {
                     grossWeight: 0,
-                    selfLoading: 1,
+                    selfLoading: 0,
                     tare: 0,
                     tips: '',
                     // contractNo:'',
@@ -1761,7 +1760,7 @@
         this.getList()
         this.weighingList = {
           grossWeight: 0,
-          selfLoading: 1,
+          selfLoading: 0,
           tare: 0,
           tips: '',
           // contractNo:'',
@@ -2019,16 +2018,22 @@
                     });
                 }
               })
-              this.carjudge=true
+              this.carjudge=false
               
               if(this.warehouseType == '1'){
                 this.recheckPrice = true
               }else{
                 this.recheckPrice = false
               }
-              
+              if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+              } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+              }
             }else{
-              this.carjudge=false
+              this.carjudge=true
               if (this.taskNolist[i].contractNo) {
                 // console.log(this.taskNolist[i])
                 this.weighingList.contractNo = this.taskNolist[i].contractNo
@@ -2143,20 +2148,30 @@
               this.weighingList.inOutTypeKey = 6
             }
             if (this.outContractNo[i].deliverType == '1') {
-              this.carstatus = true
+              this.carjudge = false
+              
             } else {
-              this.carstatus = false
+              this.carjudge = true
             }
             if (this.outContractNo[i].tranCarInfoList) {
               this.options2 = this.outContractNo[i].tranCarInfoList
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
-              this.carstatus = true
+              this.carjudge = false
+
             }
             if (this.outContractNo[i].tranCarInfoList1) {
               this.fleetNameList = this.outContractNo[i].tranCarInfoList1
             }
+            if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+              } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+              }
           }
         }
+        
       },
       selectWarehouse() {
         selectWarehouseSelf({

src/views/personnelManagement/cardReplacementManagement.vue

@@ -50,6 +50,7 @@
             <template slot-scope="scope">
               <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <span v-if="scope.row.status">{{scope.row.status}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -59,18 +60,6 @@
         layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
     </div>
-    <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
-      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
->
-        <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
-          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</div>
-        </div>
-        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
-        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
-      </div>
-    </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title"
       @on-cancel="handleClose">
     </WinseaContentModal>

src/views/personnelManagement/leaveList.vue

@@ -1,8 +1,14 @@
 //请假管理
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left"> 
+        <el-col :span="24">
+          <el-button style="margin-left:20px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
+        </el-col>
         <el-date-picker v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
           start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
@@ -32,7 +38,19 @@
       <el-table-column prop="startDate" label="开始日期"></el-table-column>
       <el-table-column prop="endDate" label="结束日期"> </el-table-column>
       <el-table-column prop="leaveDuration" label="时长"></el-table-column>
-      <el-table-column width='150' prop="approveStatus" label="状态"></el-table-column>
+      <el-table-column width='150' prop="approveStatus" label="状态">
+        <template slot-scope="scope">
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else>{{scope.row.status}}</span>
+            </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作">
+            <template slot-scope="scope">
+              <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <span v-if="scope.row.status">{{scope.row.status}}</span>
+            </template>
+          </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
@@ -43,6 +61,9 @@
   import {
     getLeavePc,
   } from '@/model/personnelManagement/index'
+  import {
+    woekflowhandle
+  } from '@/model/tasksport/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
 
@@ -82,7 +103,7 @@
         outerVisibleAdd: false,
         outerVisibleReturn: false,
         contractType: 2,
-        searchType: 1,
+        searchType: '',
         // 提交类型
         submitType: true,
         size: 10,
@@ -153,6 +174,20 @@
         this.searchType = state
         this.getList()
       },
+      typeChange(num) {
+        if (num == null || num == '') {
+          this.searchType = ''
+        } 
+        else if (num == 1) {
+          this.searchType = 1
+        }else if(num == 2){
+          this.searchType = 2
+        }else{
+          this.searchType = 3
+        }
+        this.currentPage = 1
+        this.getList()
+      },
       //列表查询
       getList() {
         getLeavePc({
@@ -160,6 +195,7 @@
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: this.searchKeyWord,
+            searchType:this.searchType,
             theStartDate: this.startDate,
             theEndDate: this.endDate,
           })
@@ -182,6 +218,74 @@
         this.currentPage = 1
         this.getList()
       },
+      pass(row){
+        if(row.taskId){
+          this.$confirm('确认通过请假申请？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:true,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '通过成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '通过失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
+      reject(row){
+        if(row.taskId){
+          this.$confirm('确认驳回请假申请？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:false,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '驳回成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '驳回失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
     },
   }
 </script>

src/views/profitable/expensemanagementdetails.vue

@@ -32,11 +32,11 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
-          <!-- <el-badge v-if="approveStatus" is-dot class="item">
+          <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left:10px" @click="oilcost()">油费</el-button>
           </el-badge>
           <el-button v-else style="margin-left:10px" @click="oilcost()">油费</el-button>
-          <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button> -->
+          <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.add`" style="margin-left:10px" @click="cashout('')">请款</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
         </el-col>

src/views/profitable/oilcost.vue

@@ -179,8 +179,7 @@
       <!-- </div> -->
     </el-dialog>
     <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
-      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
->
+      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}">
         <div style='width:100%;justify-content: space-between;' class='flex'>
           <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
           <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>

src/views/statisticalReport/autoSettlementList.vue

@@ -88,7 +88,7 @@
             <span v-if="scope.row.unloadingWeight == null">--</span>
             <span v-else-if="
               scope.row.lossWeight > 0 &&
-              scope.row.lossWeight > scope.row.loadingWeight / 1000
+              scope.row.lossWeight > scope.row.loadingWeight 
             " style="color: #f10404; font-weight: 600">{{ scope.row.lossWeight }}</span>
             <span v-else style="font-weight: 600">{{ scope.row.lossWeight }}</span>
           </template>

src/views/statisticalReport/component/routers/route.js

@@ -13,69 +13,69 @@ const statisticalReportRouter = {
   },
   children: [
     // 期货采购入库报表统计
-    {
-      path: 'purchaseReceiptStatisticsList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseReceiptStatisticsList'),
-      name: 'purchaseReceiptStatisticsList',
-      meta: {
-        title: 'purchaseReceiptStatisticsList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.procurementInReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货采购入库报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'purchaseReceiptStatisticsList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseReceiptStatisticsList'),
+    //   name: 'purchaseReceiptStatisticsList',
+    //   meta: {
+    //     title: 'purchaseReceiptStatisticsList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.procurementInReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货采购入库报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //期货采购平仓报表
-    {
-      path: 'purchaseClosingCashierList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
-      name: 'purchaseClosingCashierList',
-      meta: {
-        title: 'purchaseClosingCashierList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.procurementCloseReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货采购平仓报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'purchaseClosingCashierList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
+    //   name: 'purchaseClosingCashierList',
+    //   meta: {
+    //     title: 'purchaseClosingCashierList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.procurementCloseReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货采购平仓报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     // 期货销售出库报表统计
-    {
-      path: 'salesDeliveryReportList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesDeliveryReportList'),
-      name: 'salesDeliveryReportList',
-      meta: {
-        title: 'salesDeliveryReportList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货销售出库报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'salesDeliveryReportList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesDeliveryReportList'),
+    //   name: 'salesDeliveryReportList',
+    //   meta: {
+    //     title: 'salesDeliveryReportList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.saleOutReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货销售出库报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //期货销售平仓报表
-    {
-      path: 'salesClosingCashierList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
-      name: 'salesClosingCashierList',
-      meta: {
-        title: 'salesClosingCashierList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.saleCloseReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货销售平仓报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'salesClosingCashierList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
+    //   name: 'salesClosingCashierList',
+    //   meta: {
+    //     title: 'salesClosingCashierList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.saleCloseReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货销售平仓报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //汽运结算报表
     {
       path: 'autoSettlementList',

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -69,7 +69,11 @@
         </el-table-column>
         <el-table-column prop="warehouseName" class="table_td" label="仓库名"></el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
+        <el-table-column prop="goodsName" class="table_td" label="货名">
+          <template scope="scope">
+          {{scope.row.goodsName?scope.row.goodsName:scope.row.sourceId}}
+        </template>
+        </el-table-column>
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
@@ -85,7 +89,7 @@
                 <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
                 <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
                 <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
-                {{scope.row.approveStatus?scope.row.approveStatus:scope.row.taskStatus }}
+                {{ scope.row.approveStatus?scope.row.approveStatus:scope.row.taskStatus }}
               </span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
@@ -121,7 +125,9 @@
               <el-divider direction="vertical" v-if=" scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'"></el-divider>
             </span>
-
+            <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
+              <el-divider direction="vertical" v-if="scope.row.show"></el-divider>
+            </span>
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               " v-if="scope.row.show" @click="rectify(scope.row)">矫正</span>
@@ -131,7 +137,7 @@
 
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              " v-if="scope.row.taskId == null" @click="deleteclick(scope.row)">删除</span>
+              " v-if="!scope.row.approveStatus" @click="deleteclick(scope.row)">删除</span>
           </template>
         </el-table-column>
       </el-table>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -186,7 +186,7 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -219,7 +219,7 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -401,7 +401,7 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -210,7 +210,7 @@
         </div>
       </div>
     </ws-form>
-    <ws-form
+    <!-- <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
@@ -242,7 +242,6 @@
             />
           </div>
           <ws-info-table class="el-table">
-            <!--账户类型-->
             <ws-form-item
               label="账户类型"
               span="1"
@@ -256,7 +255,6 @@
                 >企业账户</el-radio
               >
             </ws-form-item>
-            <!--账号-->
             <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
               <ws-input
                 v-model="item.bankCard"
@@ -287,7 +285,6 @@
                 />
               </el-upload>
             </ws-form-item>
-            <!--开户行-->
             <ws-form-item
               label="开户行"
               span="1"
@@ -301,7 +298,6 @@
                 size="small"
               />
             </ws-form-item>
-            <!--姓名-->
             <ws-form-item
               label="姓名"
               v-if="item.accountTypeFlag == 1"
@@ -317,7 +313,6 @@
                 size="small"
               />
             </ws-form-item>
-            <!--企业名称-->
             <ws-form-item
               label="企业名称"
               v-else
@@ -333,8 +328,6 @@
                 size="small"
               />
             </ws-form-item>
-
-            <!--身份证号-->
             <ws-form-item
               label="身份证号"
               v-if="item.accountTypeFlag == 1"
@@ -400,8 +393,8 @@
           </ws-info-table>
         </div>
       </div>
-    </ws-form>
-    <ws-form
+    </ws-form> -->
+    <!-- <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
@@ -522,7 +515,7 @@
           />
         </div>
       </div>
-    </ws-form>
+    </ws-form> -->
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -866,67 +859,67 @@ export default {
         //   return
         // }
       }
-      for (var i = 0; i < this.freightspace1.length; i++) {
-        if (!this.freightspace1[i].bankCard) {
-          EventBus.$emit('error', '银行卡账号不能为空')
-          return
-        }
-        if (!this.freightspace1[i].bankDeposit) {
-          EventBus.$emit('error', '开户行不能为空')
-          return
-        }
-        if (!this.freightspace1[i].bankDepositBranch) {
-          EventBus.$emit('error', '开户支行不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeName == ''
-        ) {
-          EventBus.$emit('error', '收款人姓名不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard == ''
-        ) {
-          EventBus.$emit('error', '收款人身份证号码不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length > 10)
-        ) {
-          EventBus.$emit('error', '收款人姓名输入错误')
-          return
-        }
-        console.log(this.freightspace1[i].payeeNumberCard != 18)
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard.length != 18
-        ) {
-          EventBus.$emit('error', '收款人身份证号输入错误')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 2 &&
-          this.freightspace1[i].compName == ''
-        ) {
-          EventBus.$emit('error', '企业名称不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length > 30)
-        ) {
-          EventBus.$emit('error', '企业名称输入有误')
-          return
-        }
-      }
+      // for (var i = 0; i < this.freightspace1.length; i++) {
+      //   if (!this.freightspace1[i].bankCard) {
+      //     EventBus.$emit('error', '银行卡账号不能为空')
+      //     return
+      //   }
+      //   if (!this.freightspace1[i].bankDeposit) {
+      //     EventBus.$emit('error', '开户行不能为空')
+      //     return
+      //   }
+      //   if (!this.freightspace1[i].bankDepositBranch) {
+      //     EventBus.$emit('error', '开户支行不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeName == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号码不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length > 10)
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名输入错误')
+      //     return
+      //   }
+      //   console.log(this.freightspace1[i].payeeNumberCard != 18)
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard.length != 18
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号输入错误')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 2 &&
+      //     this.freightspace1[i].compName == ''
+      //   ) {
+      //     EventBus.$emit('error', '企业名称不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length > 30)
+      //   ) {
+      //     EventBus.$emit('error', '企业名称输入有误')
+      //     return
+      //   }
+      // }
       // if (!this.addressUrls.travel) {
       //   EventBus.$emit('error', '行驶证不能为空')
       //   return

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -177,6 +177,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
+                  
                   <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
@@ -260,9 +261,9 @@
             <!-- <img width="22" height="22" src="../../../public/img/add.png" alt="" /> -->
             <div class="spans">添加司机</div>
           </el-button>
-          <!-- <el-button class="add" type="primary" size="small" @click="addteam()">
+          <el-button class="add" type="primary" size="small" @click="addteam()">
             <div class="spans">添加车队</div>
-          </el-button> -->
+          </el-button>
           <div style="text-align: right; padding: 10px">
             <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
           </div>
@@ -760,7 +761,7 @@
               }
             }
           }
-          this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
+          this.$confirm(`确定提交派车信息？`, {
               cancelButtonText: '取消',
               confirmButtonText: '确定',
               type: 'warning',
@@ -859,7 +860,6 @@
               })
               .toPromise()
               .then((response) => {
-                console.log(this, response)
                 this.deptBudgetList.tranCarInfoList[index].carNo =
                   response.carNumber
                 if (response.carLoad != null) {
@@ -876,6 +876,7 @@
                   response.carLengthKey
                 this.deptBudgetList.tranCarInfoList[index].carModelKey =
                   response.carModelKey
+                  this.$forceUpdate()
               })
           }
         }

src/views/warehouse/warehouseManagementAdd.vue

@@ -318,8 +318,8 @@
       },
       // 上传附件
       uploadSuccessHandle(e) {
-        this.deptBudgetList.addressUrl += e.url + ','
-        this.addressUrls.push(e.url)
+        this.deptBudgetList.addressUrl += e.data.url + ','
+        this.addressUrls.push(e.data.url)
       },
       onChange(files) {
         this.fileNum = files

src/views/warehousenew/warehouseManagementAdd.vue

@@ -77,23 +77,8 @@
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传附件</div>
-      <!-- <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
-          (res, file) => {
-            uploadSuccessHandle(res)
-          }
-        " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
-        <el-button v-show="radio == 1">上传附件</el-button>
-      </el-upload> -->
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
         @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-      <!-- <div class="addressUrls" v-if="addressUrls != null">
-        <div class="addressUrls-item">
-          <div v-for="(item, index) in addressUrls" class="addressUrl" :key="index">
-            <div @click="close(index)" class="iconfont icon-guanbi"></div>
-            <img v-if="addressUrls != null" width="100" height="100" :src="item" alt="" />
-          </div>
-        </div>
-      </div> -->
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <!-- <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag> -->
       <map-drag @marker="marker" ref="childMap" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>