Quellcode durchsuchen

1.改动仓储费新增时弹出未找到相关计费规则,则显示查看查看仓储费用协议按钮,点击则弹出相应仓储协议内容

nzf vor 3 Jahren
Ursprung
Commit
d1d1d6c7de
1 geänderte Dateien mit 32 neuen und 14 gelöschten Zeilen
  1. 32 14
      src/views/warehouseBusiness/storageFeeCalculation/index.vue

+ 32 - 14
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -385,6 +385,7 @@
         width="80%"
         append-to-body
         :show-close="Xbutton"
+        :before-close="handleClose"
     >
       <template slot="title">
         <div class="avue-crud__dialog__header">
@@ -573,6 +574,7 @@
           @click="exportDetail"
           v-show="dataList.length > 0 && form.fMblno"
         >明细导出</el-button>
+        <el-button type="danger" v-show="showAgreementStatus" @click="showAgreement">查看仓储费用协议</el-button>
       </div>
       <div class="dialogTableTitle flex a-center jlr"
            style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
@@ -1111,7 +1113,7 @@
     <el-dialog
       v-dialogDrag
       :fullscreen="dialogFull"
-      title="仓储费详情"
+      title="仓储费协议"
       :visible.sync="openAgreement" width="80%"
       append-to-body
     >
@@ -1121,7 +1123,7 @@
             prop="fContractno"
             header-align="center"
             align="center"
-            style="width: 100%;"
+            width="150"
             label="合同编号"
           >
             <template slot-scope="scope">
@@ -1132,7 +1134,7 @@
             prop="tPackages"
             header-align="center"
             align="center"
-            style="width: 100%;"
+            width="140"
             label="货物类别"
           >
             <template slot-scope="scope">
@@ -1140,6 +1142,7 @@
                 v-model="scope.row.tPackages"
                 placeholder="请选择货物类别"
                 clearable
+                :disabled="true"
                 multiple
               >
                 <el-option
@@ -1151,8 +1154,13 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label="有效期至" sortable align="center" prop="fEnddate" width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
         </el-table>
-        <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange" style="width: 70%;float:right;flex: 4;">
+        <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange" style="width: 70%;float:right;flex: 1.86;">
           <el-table-column label="行号" align="center" type="index" fixed="left" width="100"/>
 
           <el-table-column
@@ -1203,7 +1211,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="单价" align="center" width="90">
+<!--          <el-table-column label="单价" align="center" width="90">
             <el-input
               slot-scope="scope"
               v-model="scope.row.fPrice"
@@ -1223,8 +1231,8 @@
               clearable
               size="small"
             />
-          </el-table-column>
-          <el-table-column label="录入时间" align="center" width="180">
+          </el-table-column>-->
+          <el-table-column label="录入时间" align="center" width="200">
             <el-input
               slot-scope="scope"
               v-model="scope.row.createTime"
@@ -1498,6 +1506,7 @@ export default {
       agreementitemsList: [],
       jFeetunitOptions: [],
       fTypeidOptions: [],
+      showAgreementStatus: false,
       // 选中数组
       ids: [],
       userVal: {
@@ -1890,6 +1899,7 @@ export default {
     },
     homePage() {
       this.open = false
+      this.showAgreementStatus = false
       let view = {
         fullPath: "/business/agreement",
         hash: "",
@@ -1961,6 +1971,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.showAgreementStatus = false;
       this.reset();
       this.getList();
     },
@@ -2054,15 +2065,22 @@ export default {
         }
         this.countstate = false
       },(error) => {
-        getAgreementByFCorpId(this.form.fCorpid).then((res) => {
-          this.contractnoList = res.data.contractnoList;
-          this.contractnoList.forEach(item => {
-            item.tPackages = item.tPackages.map(e => e = e.toString())
-          })
-        })
-        this.openAgreement = true
+        this.showAgreementStatus = true
       });
     },
+    showAgreement() {
+      getAgreementByFCorpId(this.form.fCorpid).then((res) => {
+        this.contractnoList = res.data.contractnoList;
+        this.contractnoList.forEach(item => {
+          item.tPackages = item.tPackages.map(e => e = e.toString())
+        })
+      })
+      this.openAgreement = true
+    },
+    handleClose () {
+      this.showAgreementStatus = false;
+      this.open = false;
+    },
     selectShow(row) {
       getAgreement(row.fId).then(response => {
         this.agreementitemsList = response.data.tWarehouseAgreementitems