Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/reportManagement/whgenleg/index.vue

@@ -130,33 +130,6 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          disabled
-          v-hasPermi="['warehouseBusiness:whgenleg:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          disabled
-          v-hasPermi="['warehouseBusiness:whgenleg:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          disabled
-          v-hasPermi="['warehouseBusiness:whgenleg:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
           type="warning"
           icon="el-icon-download"
           size="mini"
@@ -168,6 +141,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="whgenlegList">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column type="index" label="行号" align="center" />
       <el-table-column label="客户" align="center" prop="fCorpid" />
       <el-table-column label="提单号" align="center" prop="fMblno" />
       <el-table-column label="唛头" align="center" prop="fMarks" />
@@ -183,7 +158,7 @@
       <el-table-column label="入库尺码" align="center" prop="fVolumnD" />
       <el-table-column label="入库毛重" align="center" prop="fGrossweightD" />
       <el-table-column label="入库净重" align="center" prop="fNetweightD" />
-      <el-table-column label="出口尺码" align="center" prop="fVolumnC" />
+      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />
       <el-table-column label="出库件数" align="center" prop="fQtyC" />
       <el-table-column label="出库毛重" align="center" prop="fGrossweightC" />
       <el-table-column label="出库净重" align="center" prop="fNetweightC" />

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1944,7 +1944,7 @@ export default {
         this.userOptions = response.data.sysUser;
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate))
         this.open = true;
-        this.title = "修改仓入库)";
+        this.title = "修改仓入库";
       });
     },
     // 库存明细合计

src/views/warehouseBusiness/inStock/index.vue

@@ -337,7 +337,6 @@
     />
     <!-- 新增或修改仓库主(出入库)对话框 -->
     <el-dialog
-      :title="title"
       :visible.sync="open"
       :close-on-click-modal="false"
       width="80%"
@@ -742,10 +741,11 @@
         </div>
       </el-form>
 
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>库存明细</h3>
-        <el-button :disabled="browseStatus" @click.prevent="addRelevant()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        
+        <div>
+          <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
+          >新行
         </el-button>
         <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
           >入库确认
@@ -754,8 +754,9 @@
           >删除
         </el-button> -->
         <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
-               <!--点击展开-->
-        <el-button style="margin-left:19%;"
+        </div>
+        <div>
+          <el-button
           @click="
             detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
           "
@@ -780,7 +781,9 @@
           >作业单
         </el-button>
         <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button :disabled="browseStatus" type="primary" @click="submitForm(6)">请核</el-button>
+        <el-button :disabled="browseStatus" style="background-color: #008000;color:#fff" @click="submitForm(6)">请核</el-button>
+        </div>
+        <div style="font-size:18px">入库明细</div>
       </div>
       <el-table
         :data="dataList"
@@ -1134,11 +1137,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>附件上传</h3>
-        <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevt()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        <div>
+          <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevt()"
+          >新行
         </el-button>
+        </div>
+         <div>附件明细</div>
       </div>
       <el-table
         :data="relevantAttachments"
@@ -1178,7 +1183,7 @@
             <el-input
               v-model="scope.row.createBy"
               :disabled="browseStatus"
-              placeholder="上传人"
+              placeholder="默认登陆人"
               show-word-limit
             />
           </template>
@@ -1229,10 +1234,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>收款信息</h3>
-        <el-button type="primary" :disabled="browseStatus" @click.prevent="addCollection()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        <div>
+           <el-button type="primary" :disabled="browseStatus" @click.prevent="addCollection()"
+          >新行
         </el-button>
         <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
           >删除
@@ -1240,6 +1245,8 @@
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
         <el-button @click.prevent="addAgreement()" type="danger">作业费协议</el-button>
+        </div>
+        <div style="font-size:18px">收款信息</div>
       </div>
       <el-table
         :data="warehouseDrList"
@@ -1461,17 +1468,18 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>付款信息</h3>
-        <el-button type="primary"  :disabled="browseStatus" @click.prevent="addpayment()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        <div>      <el-button type="primary"  :disabled="browseStatus" @click.prevent="addpayment()"
+          >新行
         </el-button>
         <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
           >删除
         </el-button> -->
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <!-- <el-button type="warning">仓储费协议</el-button> -->
-        <el-button type="danger">作业费协议</el-button>
+        <el-button type="danger">作业费协议</el-button></div>
+        <div style="font-size:18px">付款信息</div>
+  
       </div>
       <el-table
         :data="warehouseCrList"
@@ -1715,7 +1723,7 @@
           >作业单
         </el-button>
         <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button :disabled="browseStatus" type="primary" @click="submitForm(6)">请核</el-button>
+        <el-button :disabled="browseStatus" style="background-color: #008000;color:#fff" @click="submitForm(6)">请核</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <!-- 选择库存总账数据 -->

src/views/warehouseBusiness/outStock/index.vue

@@ -344,7 +344,6 @@
     />
     <!-- 新增或修改仓库主(出入库)对话框 -->
     <el-dialog
-      :title="title"
       :visible.sync="open"
       :close-on-click-modal="false"
       width="80%"
@@ -747,10 +746,11 @@
         </div>
       </el-form>
 
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>库存明细</h3>
-        <el-button :disabled="browseStatus" @click.prevent="addRelevant()"
-          >新增
+      <div style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        
+        <div>
+          <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
+          >新行
         </el-button>
         <el-button
           :disabled="dataListSelection.length <= 0"
@@ -761,8 +761,9 @@
           >删除
         </el-button> -->
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-         <!--点击展开-->
-        <el-button style="margin-left:19%;"
+        </div>
+        <div style="display:flex">
+           <el-button
           @click="
             detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
           "
@@ -778,7 +779,11 @@
         <el-button type="info" prop="打印" @click="showEditDialog_sss"
           >作业单
         </el-button>
-        <el-button type="primary" @click="submitForm(6)">请核</el-button>
+        <el-button style="background-color: #008000;color:#fff" @click="submitForm(6)">请核</el-button>
+        </div>
+        <div style="font-size:18px">出库明细</div>
+         <!--点击展开-->
+       
       </div>
       <el-table
         :data="dataList"
@@ -1083,11 +1088,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>附件上传</h3>
-        <el-button :disabled="browseStatus" @click.prevent="addRelevt()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        <div>
+           <el-button :disabled="browseStatus" @click.prevent="addRelevt()"
+          >新行
         </el-button>
+        </div>
+       <div style="font-size:18px">附件明细</div>
       </div>
       <el-table
         :data="relevantAttachments"
@@ -1127,7 +1134,7 @@
             <el-input
               v-model="scope.row.createBy"
               :disabled="browseStatus"
-              placeholder="上传人"
+              placeholder="默认登陆人"
               show-word-limit
             />
           </template>
@@ -1177,10 +1184,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>收款信息</h3>
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+        <div>
         <el-button :disabled="browseStatus" @click.prevent="addCollection()"
-          >新增
+          >新行
         </el-button>
         <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
           >删除
@@ -1188,6 +1195,8 @@
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <el-button type="warning">仓储费协议</el-button>
         <el-button type="danger">作业费协议</el-button>
+        </div>
+        <div style="font-size:18px;">收款信息</div>
       </div>
       <el-table
         :data="warehouseDrList"
@@ -1253,18 +1262,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="ffeeUnitid"
+          prop="fFeeUnitid"
           header-align="center"
           align="center"
           width="180px"
           label="计价单位"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fFeeUnitid"
-              placeholder="计价单位"
-              show-word-limit
-            /> -->
             <el-select
               v-model="scope.row.fFeeUnitid"
               placeholder="请选择计费单位"
@@ -1414,10 +1418,11 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="dialogTableTitle flex a-center jlr">
-        <h3>付款信息</h3>
-        <el-button :disabled="browseStatus" @click.prevent="addpayment()"
-          >新增
+      <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
+       
+       <div> 
+         <el-button :disabled="browseStatus" @click.prevent="addpayment()"
+          >新行
         </el-button>
         <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
           >删除
@@ -1425,6 +1430,9 @@
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <el-button type="warning">仓储费协议</el-button>
         <el-button type="danger">作业费协议</el-button>
+         </div> 
+         <div style="font-size:18px">付款信息</div>
+       
       </div>
       <el-table
         :data="warehouseCrList"
@@ -1657,7 +1665,7 @@
           >作业单
         </el-button>
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="primary" @click="submitForm(6)">提交审核</el-button>
+        <el-button style="background-color: #008000;color:#fff" @click="submitForm(6)">请核</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <!-- 选择库存总账数据 -->
@@ -2404,7 +2412,7 @@ export default {
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
      }
-          
+
       this.editDialogVisible_s = true;
       console.log(this.fMblnoOptions)
       console.log(this.form.fCorpid)
@@ -2413,7 +2421,7 @@ export default {
                 this.$set(this.form, "fCorpid", this.fMblnoOptions[corp].fName);
               }
             }
-            
+
             for(let sorp in this.warehouseOptions){
               console.log(this.form.fWarehouseid)
               if(this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
@@ -2893,7 +2901,16 @@ export default {
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
           addWhgenleg(formData).then((response) => {
-            this.fid = response.data;
+            this.fid = response.data.fPid;
+            // 仓储费得出的明细
+            this.fWbuOptions = response.data.fees;
+            let warehousebillsfees = response.data.warehousebillsfees;
+            for (let fees in warehousebillsfees) {
+              this.$set(warehousebillsfees[fees], 'fFeeid', warehousebillsfees[fees].fFeeid + '')
+              this.$set(warehousebillsfees[fees], 'fCorpid', warehousebillsfees[fees].fCorpid + '')
+              this.$set(warehousebillsfees[fees], 'fFeeUnitid', warehousebillsfees[fees].fFeeUnitid + '')
+              this.warehouseDrList.push(warehousebillsfees[fees])
+            }
             this.msgSuccess("出库成功");
             this.formBrowseStatus = true
             for (let li in this.dataListSelection) {
@@ -2952,7 +2969,7 @@ export default {
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.fBsdate = Y + M + D;
-         
+
       }
     },
     // 计价单位选择