Bläddra i källkod

仓储排序和驾驶员信息修改

wengyuwen 4 år sedan
förälder
incheckning
0c7ef028e2

+ 4 - 4
src/views/agreement/agreementTask/index.vue

@@ -150,15 +150,15 @@
     </el-row>
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户名称" align="center" prop="fCorpid" width="220"/>
-      <el-table-column label="协议编号" align="center" prop="fContractno" show-overflow-tooltip/>
+      <el-table-column label="客户名称" sortable align="center" prop="fCorpid" width="220"/>
+      <el-table-column label="协议编号" sortable align="center" prop="fContractno" show-overflow-tooltip/>
 <!--      <el-table-column label="费用名称" align="center" prop="fFeeid"/>-->
-      <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">
+      <el-table-column label="有效期起" sortable align="center" prop="fBegindate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBegindate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="有效期至" align="center" prop="fEnddate" width="180">
+      <el-table-column label="有效期至" sortable align="center" prop="fEnddate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
         </template>

+ 36 - 13
src/views/basicdata/fleet/driverMsg-add-or-update.vue

@@ -6,7 +6,7 @@
     :visible.sync="visible" width="70%">
     <el-form :model="dataFormD" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="200px">
       <el-form-item label="驾驶员所属公司" prop="fleetCompanyId">
-        <el-select v-model="dataFormD.fleetCompanyId" placeholder="请选择">
+        <el-select v-model="dataFormD.fleetCompanyId" :disabled="doNot" placeholder="请选择">
           <el-option
             v-for="item in optionsProjectTypeItem"
             :key="item.id"
@@ -16,11 +16,11 @@
         </el-select>
       </el-form-item>
           <el-form-item label="驾驶员姓名" prop="name">
-            <el-input v-model="dataFormD.name" placeholder="驾驶员姓名"></el-input>
+            <el-input v-model="dataFormD.name" :disabled="doNot" placeholder="驾驶员姓名"></el-input>
           </el-form-item>
           <el-form-item label="性别" prop="sex">
 <!--            <el-input v-model="dataForm.sex" placeholder="性别(0男/1女)"></el-input>-->
-            <el-radio-group style="margin-left: 20px;" v-model="dataFormD.sex">
+            <el-radio-group style="margin-left: 20px;" :disabled="doNot" v-model="dataFormD.sex">
               <el-radio :label="0">男</el-radio>
               <el-radio :label="1">女</el-radio>
             </el-radio-group>
@@ -32,11 +32,12 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               v-model="dataFormD.birthday"
               type="date"
+              :disabled="doNot"
               placeholder="出生日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="准驾车型" prop="allowDriverCar">
-            <el-input v-model="dataFormD.allowDriverCar" placeholder="准驾车型"></el-input>
+            <el-input v-model="dataFormD.allowDriverCar" :disabled="doNot" placeholder="准驾车型"></el-input>
           </el-form-item>
           <el-form-item label="初次领证日期" prop="firstCertificateDate">
 <!--            <el-input v-model="dataForm.firstCertificateDate" placeholder="初次领证日期"></el-input>-->
@@ -45,17 +46,18 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               v-model="dataFormD.firstCertificateDate"
               type="date"
+              :disabled="doNot"
               placeholder="初次领证日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="身份证号" prop="idcarNum">
-            <el-input v-model="dataFormD.idcarNum" placeholder="身份证号"></el-input>
+            <el-input v-model="dataFormD.idcarNum" :disabled="doNot" placeholder="身份证号"></el-input>
           </el-form-item>
           <el-form-item label="联系电话" prop="tel">
-            <el-input v-model="dataFormD.tel" placeholder="联系电话"></el-input>
+            <el-input v-model="dataFormD.tel" :disabled="doNot" placeholder="联系电话"></el-input>
           </el-form-item>
           <el-form-item label="家庭住址" prop="address">
-            <el-input v-model="dataFormD.address" placeholder="家庭住址"></el-input>
+            <el-input v-model="dataFormD.address" :disabled="doNot" placeholder="家庭住址"></el-input>
           </el-form-item>
       <br>
           <el-form-item label="个人照片" prop="resumePic">
@@ -66,11 +68,12 @@
               :on-remove="(res,file)=>{handleRemove(2,res,file)}"
               :on-success="(res,file)=>{handleSuccess(1,res,file)}"
               multiple
+              :disabled="doNot"
               :limit="1"
               :headers="headers"
               :on-exceed="handleExceed">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <el-button size="small" type="primary" v-if="dataFormD.resumePic" @click="preview(1)">预览</el-button>
+              <el-button size="small" type="primary" :disabled="doNot">点击上传</el-button>
+              <el-button size="small" type="primary" :disabled="doNot" v-if="dataFormD.resumePic" @click="preview(1)">预览</el-button>
             </el-upload>
           </el-form-item>
           <el-form-item label="驾驶证照片" prop="drivingPic">
@@ -81,17 +84,19 @@
               :on-remove="(res,file)=>{handleRemove(2,res,file)}"
               :on-success="(res,file)=>{handleSuccess(2,res,file)}"
               multiple
+              :disabled="doNot"
               :limit="1"
               :headers="headers"
               :on-exceed="handleExceed">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <el-button size="small" type="primary" v-if="dataFormD.drivingPic" @click="preview(2)">预览</el-button>
+              <el-button size="small" :disabled="doNot" type="primary">点击上传</el-button>
+              <el-button size="small" :disabled="doNot" type="primary" v-if="dataFormD.drivingPic" @click="preview(2)">预览</el-button>
             </el-upload>
           </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
+      <el-button type="info" @click="handleUpdata">修改</el-button>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -109,6 +114,7 @@ import { getToken } from '@/utils/auth'
     },
     data () {
       return {
+        doNot:true,
         visible: false,
         dataFormD:{},
         uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
@@ -139,6 +145,9 @@ import { getToken } from '@/utils/auth'
       }
     },
     methods: {
+      handleUpdata(){
+        this.doNot = false
+      },
       preview(actid){
         if (actid === 1){
           window.open(this.dataFormD.resumePic)
@@ -161,6 +170,7 @@ import { getToken } from '@/utils/auth'
         console.log(this.dataForm)
         if (this.dataForm.id) {
           lookOver(this.dataForm.id).then(data => {
+            this.doNot = true
             console.log(data)
             this.dataFormD = data.data
             this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs
@@ -170,7 +180,20 @@ import { getToken } from '@/utils/auth'
             }
           })
         }else {
-          this.dataFormD = {}
+          this.dataFormD = {
+            fleetCompanyId:'',
+            name:'',
+            sex:'',
+            birthday:'',
+            allowDriverCar:'',
+            firstCertificateDate:'',
+            idcarNum:'',
+            tel:'',
+            address:'',
+            resumePic:'',
+            drivingPic:'',
+          }
+          this.doNot = false
         }
       },
       // 获取下拉选项

+ 16 - 8
src/views/basicdata/fleet/driverMsg.vue

@@ -133,14 +133,22 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">
-            <el-button type="primary"
-                       v-hasPermi="['fleet:driverMsg:edit']"
-                       icon="el-icon-edit"
-                       content="修改"
-                       size="mini"
-                       circle @click="addOrUpdateHandle(scope.row)"></el-button>
-          </el-tooltip>
+<!--          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">-->
+<!--            <el-button type="primary"-->
+<!--                       v-hasPermi="['fleet:driverMsg:edit']"-->
+<!--                       icon="el-icon-edit"-->
+<!--                       content="修改"-->
+<!--                       size="mini"-->
+<!--                       circle @click="addOrUpdateHandle(scope.row)"></el-button>-->
+<!--          </el-tooltip>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="addOrUpdateHandle(scope.row)"
+            v-hasPermi="['fleet:driverMsg:edit']"
+          >查看
+          </el-button>
           <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">
             <el-button type="danger"
                        v-hasPermi="['fleet:driverMsg:delete']"

+ 1 - 1
src/views/reportManagement/whgenleg/index.vue

@@ -129,7 +129,7 @@
           <span>{{ parseTime(scope.row.fOriginalbilldate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="仓储费计算日期" sortable align="center" prop="fChargedate" fixed width="120">
+      <el-table-column label="仓储费计算日期" sortable align="center" prop="fChargedate" fixed width="140">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fChargedate , "{y}-{m}-{d}") }}</span>
         </template>

+ 4 - 4
src/views/warehouseBusiness/agreement/index.vue

@@ -129,15 +129,15 @@
 
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="合同编号" align="center" prop="fContractno" show-overflow-tooltip/>
-      <el-table-column label="客户名称" align="center" width="220" prop="fCorpid"/>
+      <el-table-column label="合同编号" sortable align="center" prop="fContractno" show-overflow-tooltip/>
+      <el-table-column label="客户名称" sortable align="center" width="220" prop="fCorpid"/>
       <!--      <el-table-column label="货物品名" align="center" prop="fGoodsid"/>-->
-      <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">
+      <el-table-column label="有效期起" sortable align="center" prop="fBegindate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBegindate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="有效期至" align="center" prop="fEnddate" width="180">
+      <el-table-column label="有效期至" sortable align="center" prop="fEnddate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
         </template>

+ 3 - 1
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -189,10 +189,11 @@
         align="center"
         prop="fBillno"
       />
-      <el-table-column label="客户名称" align="center" prop="fCorpid" show-overflow-tooltip/>
+      <el-table-column label="客户名称" align="center" sortable prop="fCorpid" show-overflow-tooltip/>
       <el-table-column
         label="计费日期"
         align="center"
+        sortable
         prop="fBillingDeadline"
         width="180"
       >
@@ -208,6 +209,7 @@
       <el-table-column
         label="单据状态"
         align="center"
+        sortable
         prop="fBillstatus"
       >
         <template slot-scope="scope">