更新 航次详情权限

src/auth/isAuthDisabled.js

@@ -0,0 +1,15 @@
+function includes(arr1, arr2) {
+  return arr2.every((val) => arr1.includes(val));
+}
+function isAuthDisabled(per) {
+  let permissions = localStorage.rolePermission?.split(",") || [];
+  let currentPermissions = per.split(",");
+
+  if (!includes(permissions, currentPermissions)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+export default isAuthDisabled;

src/main.js

@@ -64,11 +64,15 @@ router.afterEach((to, from) => {
   store.commit("setCurrentMenuItem", to.path);
   store.commit("changefirstTitle", title);
 });
+function includes(arr1, arr2) {
+  return arr2.every((val) => arr1.includes(val));
+}
 
 app.directive("auth", {
   mounted(el, bind) {
     let permissions = localStorage.rolePermission?.split(",") || [];
-    if (permissions.indexOf(bind.value) == -1) {
+    let currentPermissions = bind.value.split(",");
+    if (!includes(permissions, currentPermissions)) {
       el.parentNode.removeChild(el);
     }
   },

src/views/voyage/voyageDetail.vue

@@ -511,209 +511,226 @@
       </div>
       <div class="hr mt20"></div>
     </div>
-    <div class="container-second-title df aic jcsb mt40">
-      <div>提单信息</div>
-      <div>
-        <el-button type="primary" @click="showAddLab()">新增提单记录</el-button>
+    <div v-auth="'LABDETAIL'">
+      <div class="container-second-title df aic jcsb mt40">
+        <div>提单信息</div>
+        <div>
+          <el-button v-auth="'LABADD'" type="primary" @click="showAddLab()">
+            新增提单记录
+          </el-button>
+        </div>
       </div>
-    </div>
-    <el-table :data="labTableData" stripe style="width: 1200px">
-      <el-table-column
-        type="index"
-        label="序号"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="billingNum"
-        label="开单数量"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="billingDate"
-        label="开单日期"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column label="单据" min-width="150" align="center">
-        <template v-slot="scope">
-          <el-button
-            @click="showLab(scope.row, scope.$index, '查看提单')"
-            type="primary"
-            size="small"
-          >
-            {{ scope.row.file ? "查看" : "上传" }}
+      <el-table :data="labTableData" stripe style="width: 1200px">
+        <el-table-column
+          type="index"
+          label="序号"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="billingNum"
+          label="开单数量"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="billingDate"
+          label="开单日期"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="单据" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              @click="showLab(scope.row, scope.$index, '查看提单')"
+              type="primary"
+              size="small"
+            >
+              {{ scope.row.file ? "查看" : "上传" }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              v-auth="'LABUPDATE'"
+              @click="showLab(scope.row, scope.$index, '修改提单')"
+              type="primary"
+              size="small"
+            >
+              修改
+            </el-button>
+            <el-button
+              v-auth="'LABDELETE'"
+              @click="deleteLab(scope.row.id, scope.$index)"
+              type="danger"
+              size="small"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; margin-top: 43px; width: 1200px">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :total="labTotal"
+          @current-change="labPageChange"
+        ></el-pagination>
+      </div>
+      <el-dialog
+        v-model="isAddLabVisable"
+        :title="labModalType"
+        width="780px"
+        center
+        @close="cancelUploadLab"
+        destroy-on-close
+      >
+        <el-form
+          :model="labForm"
+          inline
+          style="margin-bottom: 20px"
+          label-width="100px"
+        >
+          <el-form-item label="开单日期">
+            <el-date-picker
+              class="info-line-text"
+              v-model="labForm.billingDate"
+              type="date"
+              format="YYYY/MM/DD"
+              value-format="YYYY/MM/DD"
+              placeholder="开单日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="开单数量">
+            <el-input
+              style="width: 240px"
+              v-model="labForm.billingNum"
+              placeholder="开单数量"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="提单">
+            <Uploader
+              :actionUrl="store.state.wayBillUrl"
+              :uploaderId="'labLoad'"
+              :params="labParams"
+              @onSendFileList="getLabBillList"
+              :fileList="labBillList"
+              uploadText="上传提单"
+              :disabled="labModalType == '查看提单'"
+              :limit="1"
+            ></Uploader>
+          </el-form-item>
+        </el-form>
+
+        <template #footer v-if="labModalType != '查看提单'">
+          <el-button @click="cancelUploadLab">取消</el-button>
+          <el-button style="margin-left: 30px" type="primary" @click="addLab">
+            提交
           </el-button>
         </template>
-      </el-table-column>
-      <el-table-column label="操作" min-width="150" align="center">
-        <template v-slot="scope">
+      </el-dialog>
+      <div class="hr mt20"></div>
+    </div>
+    <div v-auth="'SHIPDISCHARGE'">
+      <div class="container-second-title df aic jcsb">
+        <div>卸货记录</div>
+        <div>
           <el-button
-            @click="showLab(scope.row, scope.$index, '修改提单')"
+            v-auth="'SHIPDISCHARGEADD'"
+            class="mr20"
             type="primary"
-            size="small"
+            @click="showAddPoundModal"
           >
-            修改
+            新增卸货记录
           </el-button>
           <el-button
-            @click="deleteLab(scope.row.id, scope.$index)"
-            type="danger"
-            size="small"
+            v-auth="'DOWNLOADDISCHARGE'"
+            @click="exportDischargeExcel"
+            style="width: 160px"
+            type="primary"
+            :loading="isDischargeLoadingExcel"
           >
-            删除
+            下载卸货信息
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: right; margin-top: 43px; width: 1200px">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="labTotal"
-        @current-change="labPageChange"
-      ></el-pagination>
-    </div>
-    <el-dialog
-      v-model="isAddLabVisable"
-      :title="labModalType"
-      width="780px"
-      center
-      @close="cancelUploadLab"
-      destroy-on-close
-    >
-      <el-form
-        :model="labForm"
-        inline
-        style="margin-bottom: 20px"
-        label-width="100px"
+        </div>
+      </div>
+      <el-table
+        style="width: 1200px"
+        :data="dischargeList"
+        stripe
+        :disabled="disabledStatus"
       >
-        <el-form-item label="开单日期">
-          <el-date-picker
-            class="info-line-text"
-            v-model="labForm.billingDate"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY/MM/DD"
-            placeholder="开单日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="开单数量">
-          <el-input
-            style="width: 240px"
-            v-model="labForm.billingNum"
-            placeholder="开单数量"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="提单">
-          <Uploader
-            :actionUrl="store.state.wayBillUrl"
-            :uploaderId="'labLoad'"
-            :params="labParams"
-            @onSendFileList="getLabBillList"
-            :fileList="labBillList"
-            uploadText="上传提单"
-            :limit="1"
-          ></Uploader>
-        </el-form-item>
-      </el-form>
-
-      <template #footer>
-        <el-button @click="cancelUploadLab">取消</el-button>
-        <el-button style="margin-left: 30px" type="primary" @click="addLab">
-          提交
-        </el-button>
-      </template>
-    </el-dialog>
-    <div class="hr mt20"></div>
-
-    <div class="container-second-title df aic jcsb">
-      <div>卸货记录</div>
-      <div>
-        <el-button class="mr20" type="primary" @click="showAddPoundModal">
-          新增卸货记录
-        </el-button>
-        <el-button
-          @click="exportDischargeExcel"
-          style="width: 160px"
-          type="primary"
-          :loading="isDischargeLoadingExcel"
+        <el-table-column
+          type="index"
+          label="序号"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dischargeTime"
+          label="卸货时间"
+          min-width="120"
+          align="center"
         >
-          下载卸货信息
-        </el-button>
+          <template v-slot="scope">
+            {{ subTimeStr(scope.row.dischargeTime, 16) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="dischargeTons"
+          label="卸货吨位"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dischargePieces"
+          label="卸货件数"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="磅单" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              @click="showUpdateDischarge(scope.row, scope.$index, '查看记录')"
+              type="primary"
+              size="small"
+            >
+              {{ scope.row.files ? "查看" : "上传" }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              v-auth="'SHIPDISCHARGEUPDATE'"
+              @click="showUpdateDischarge(scope.row, scope.$index, '修改记录')"
+              type="primary"
+              size="small"
+            >
+              修改
+            </el-button>
+            <el-button
+              v-auth="'SHIPDISCHARGEDELETE'"
+              @click="deleteDischarge(scope.row.id, scope.$index)"
+              type="danger"
+              size="small"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="width: 1200px; text-align: right; margin-top: 43px">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :total="total"
+          @current-change="pageChange"
+        ></el-pagination>
       </div>
-    </div>
-    <el-table
-      style="width: 1200px"
-      :data="dischargeList"
-      stripe
-      :disabled="disabledStatus"
-    >
-      <el-table-column
-        type="index"
-        label="序号"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="dischargeTime"
-        label="卸货时间"
-        min-width="120"
-        align="center"
-      >
-        <template v-slot="scope">
-          {{ subTimeStr(scope.row.dischargeTime, 16) }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="dischargeTons"
-        label="卸货吨位"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="dischargePieces"
-        label="卸货件数"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column label="磅单" min-width="150" align="center">
-        <template v-slot="scope">
-          <el-button
-            @click="showUpdateDischarge(scope.row, scope.$index)"
-            type="primary"
-            size="small"
-          >
-            {{ scope.row.files ? "查看" : "上传" }}
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" min-width="150" align="center">
-        <template v-slot="scope">
-          <el-button
-            @click="showUpdateDischarge(scope.row, scope.$index)"
-            type="primary"
-            size="small"
-          >
-            修改
-          </el-button>
-          <el-button
-            @click="deleteDischarge(scope.row.id, scope.$index)"
-            type="danger"
-            size="small"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="width: 1200px; text-align: right; margin-top: 43px">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="total"
-        @current-change="pageChange"
-      ></el-pagination>
+      <div class="hr m30-0"></div>
     </div>
     <el-dialog
       title="新增卸货记录"
@@ -762,7 +779,7 @@
     </el-dialog>
     <el-dialog
       v-model="updateDischargeDialog"
-      title="修改记录"
+      :title="dischargeDialogTitle"
       width="700px"
       center
       destroy-on-close
@@ -796,16 +813,23 @@
             @onSendFileList="getupdatePoundBillList"
             :fileList="updatePoundBillList"
             uploadText="拖拽或点击上传磅单"
+            :disabled="dischargeDialogTitle == '查看记录'"
           ></Uploader>
         </el-form-item>
       </el-form>
 
       <template #footer>
-        <el-button @click="cancelUpdateDischarge">取消</el-button>
+        <el-button
+          v-if="dischargeDialogTitle == '修改记录'"
+          @click="cancelUpdateDischarge"
+        >
+          取消
+        </el-button>
         <el-button
           style="margin-left: 30px"
           type="primary"
           @click="updateDischarge"
+          v-if="dischargeDialogTitle == '修改记录'"
         >
           提交
         </el-button>
@@ -822,132 +846,138 @@
         style="height: 100%; width: 100%"
       ></el-image>
     </el-dialog>
-
-    <div class="hr m30-0"></div>
-    <div class="container-second-title df aic jcsb mt40">
-      <div>汽车装货记录详情</div>
-      <div>
-        <el-button type="primary" @click="showAddTruckRecord()">
-          新增汽车装货记录
-        </el-button>
-      </div>
-    </div>
-    <el-table :data="truckTableData" stripe>
-      <el-table-column
-        type="index"
-        label="序号"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="portName"
-        label="港口名称"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="weighTime"
-        label="称重时间"
-        min-width="120"
-        align="center"
-      >
-        <template v-slot="scope">
-          {{ subTimeStr(scope.row.weighTime, 16) }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="carNum"
-        label="车号"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="cargoName"
-        label="货物名称"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="shippingUnit"
-        label="发货单位"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="receivingUnit"
-        label="收货单位"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="grossWeight"
-        label="毛重"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="tare"
-        label="皮重"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="netWeight"
-        label="净重"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="shipName"
-        label="货船名称"
-        min-width="120"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="weigher"
-        label="司磅员"
-        min-width="100"
-        align="center"
-      ></el-table-column>
-      <el-table-column label="单据" min-width="150" align="center">
-        <template v-slot="scope">
-          <el-button
-            @click="showTruckRecord(scope.row, scope.$index, '查看单据')"
-            type="primary"
-            size="small"
-          >
-            {{ scope.row.file ? "查看" : "上传" }}
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" min-width="150" align="center">
-        <template v-slot="scope">
+    <div v-auth="'CARLOAD'">
+      <div class="container-second-title df aic jcsb mt40">
+        <div>汽车装货记录详情</div>
+        <div>
           <el-button
-            @click="showTruckRecord(scope.row, scope.$index, '修改单据')"
+            v-auth="'CARLOADADD'"
             type="primary"
-            size="small"
+            @click="showAddTruckRecord()"
           >
-            修改
+            新增汽车装货记录
           </el-button>
-          <el-button
-            @click="deleteTruckRecord(scope.row.id, scope.$index)"
-            type="danger"
-            size="small"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: right; margin-top: 43px">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="truckTotal"
-        @current-change="truckPageChange"
-      ></el-pagination>
+        </div>
+      </div>
+      <el-table :data="truckTableData" stripe>
+        <el-table-column
+          type="index"
+          label="序号"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="portName"
+          label="港口名称"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="weighTime"
+          label="称重时间"
+          min-width="120"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ subTimeStr(scope.row.weighTime, 16) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="carNum"
+          label="车号"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="cargoName"
+          label="货物名称"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="shippingUnit"
+          label="发货单位"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="receivingUnit"
+          label="收货单位"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="grossWeight"
+          label="毛重"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="tare"
+          label="皮重"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="netWeight"
+          label="净重"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="shipName"
+          label="货船名称"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="weigher"
+          label="司磅员"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="单据" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              @click="showTruckRecord(scope.row, scope.$index, '查看单据')"
+              type="primary"
+              size="small"
+            >
+              {{ scope.row.file ? "查看" : "上传" }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="150" align="center">
+          <template v-slot="scope">
+            <el-button
+              v-auth="'CARLOADUPDATE'"
+              @click="showTruckRecord(scope.row, scope.$index, '修改单据')"
+              type="primary"
+              size="small"
+            >
+              修改
+            </el-button>
+            <el-button
+              v-auth="'CARLOADDELETE'"
+              @click="deleteTruckRecord(scope.row.id, scope.$index)"
+              type="danger"
+              size="small"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; margin-top: 43px">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :total="truckTotal"
+          @current-change="truckPageChange"
+        ></el-pagination>
+      </div>
+      <div class="hr mt20"></div>
     </div>
-    <div class="hr mt20"></div>
     <div class="df aic jcfe mt20" v-if="voyage.voyageStatus == 1">
       <el-button
         v-auth="'CANCELVOYAGE'"
@@ -1075,14 +1105,21 @@
             @onSendFileList="getTruckLoadBillList"
             :fileList="truckRecordBillList"
             uploadText="上传装货单"
+            :disabled="truckRecordModalType == '查看单据'"
             :limit="1"
           ></Uploader>
         </el-form-item>
       </el-form>
 
       <template #footer>
-        <el-button @click="cancelUploadTruckRecord">取消</el-button>
         <el-button
+          v-if="truckRecordModalType != '查看单据'"
+          @click="cancelUploadTruckRecord"
+        >
+          取消
+        </el-button>
+        <el-button
+          v-if="truckRecordModalType != '查看单据'"
           style="margin-left: 30px"
           type="primary"
           @click="addTruckLoadRecord"
@@ -1092,9 +1129,10 @@
       </template>
     </el-dialog>
   </div>
+
   <div class="container-title" v-auth="'BILLINFO'">单据信息</div>
   <div class="line-container-p24" v-auth="'BILLINFO'">
-    <div class="line">
+    <div class="line" v-auth="'POLICY'">
       <div class="info-line">
         <div class="info-line-title">保险单</div>
         <el-upload
@@ -1107,13 +1145,14 @@
           :data="policyParams"
           :on-success="policyUploadSuccess"
           :file-list="policyFileList"
+          :disabled="isAuthDisabled('POLICYADD')"
         >
           <div class="upload-plus-icon">+</div>
           <div class="upload-text">拖拽或点击上传</div>
         </el-upload>
       </div>
     </div>
-    <div class="line">
+    <div class="line" v-auth="'WAYBILL'">
       <div class="info-line">
         <div class="info-line-title">运单</div>
         <el-upload
@@ -1126,6 +1165,7 @@
           :data="billParams"
           :on-success="billUploadSuccess"
           :file-list="voyageBill"
+          :disabled="isAuthDisabled('WAYBILLADD')"
         >
           <div class="upload-plus-icon">+</div>
           <div class="upload-text">拖拽或点击上传</div>
@@ -1196,6 +1236,7 @@
       <el-button
         style="width: 220px; margin-right: 20px"
         type="primary"
+        v-auth="'DOBILLDISTRIBUTE'"
         @click="showDistributeModal"
       >
         分配单据
@@ -1523,7 +1564,10 @@
                 alt=""
               />
             </div>
-            <div class="checkbox-group df aic jcsa mb10">
+            <div
+              class="checkbox-group df aic jcsa mb10"
+              v-auth="'VOYAGEIMAGEAUDIT'"
+            >
               <el-checkbox
                 @change="auditMedia(item.id, 1, index, item.mediaType)"
                 :model-value="item.audit == 1"
@@ -1535,7 +1579,7 @@
                 label="未通过"
               ></el-checkbox>
             </div>
-            <div class="checkbox-group df aic jcsa">
+            <div class="checkbox-group df aic jcsa" v-auth="'VOYAGEIMAGEAUDIT'">
               <el-checkbox
                 @change="markMedia(item.id, 1, index, item.mediaType)"
                 :model-value="item.type == 1"
@@ -1593,6 +1637,7 @@ import downloadBlobFile from "../../utils/downloadBlobFile";
 import url from "../../apis/config";
 import { subTimeStr } from "utils/utils";
 import * as dayjs from "dayjs";
+import isAuthDisabled from "../../auth/isAuthDisabled";
 
 const route = useRoute();
 let map = ref({});
@@ -1766,7 +1811,9 @@ async function updateDischarge() {
     });
   }
 }
-function showUpdateDischarge(item, index) {
+let dischargeDialogTitle = ref("");
+function showUpdateDischarge(item, index, text) {
+  dischargeDialogTitle.value = text;
   updateDischargeDialog.value = true;
   updatePoundBillList.value = [];
 

src/views/voyage/voyageList.vue

@@ -521,10 +521,6 @@ async function getVoyageList() {
     total.value = res.data.total;
   } else {
     total.value = 0;
-    ElNotification({
-      type: "error",
-      title: res.data.msg,
-    });
   }
 }
 function changeVoyageType(s) {