调整页面细节

src/views/finance/contrast/index.vue

@@ -312,11 +312,7 @@
       >
         <el-table-column label="行号" align="center" type="index" />
         <el-table-column label="提单号" align="center" prop="fMblno" />
-        <el-table-column label="业务日期" align="center" prop="fBsdate">
-          <template slot-scope="scope">
-            <span>{{scope.row.fBsdate.slice(0,10)}}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="业务日期" align="center" prop="fBsdate"/>
         <el-table-column label="费用名称" align="center" prop="fFeeName" />
         <el-table-column label="收/付" align="center" prop="fSrcdc">
           <template slot-scope="scope">
@@ -335,6 +331,14 @@
             <span v-else>{{scope.row.fBilltype}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="来源编号" align="center" prop="srcBillNo" />
+        <el-table-column label="提单号" align="center" prop="fMblno" />
+        <el-table-column label="货物品名" align="center" prop="fProductName" />
+        <el-table-column label="品牌" align="center" prop="fMarks" />
+        <el-table-column label="计费起始日期" align="center" prop="fChargedate" />
+        <el-table-column label="计费截止日期" align="center" prop="fBillingDeadline" />
+        <el-table-column label="计费天数" align="center" prop="fBillingDays" />
+        <el-table-column label="库存天数" align="center" prop="fInventoryDays" />
         <el-table-column label="备注" align="center" prop="fRemarks"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -1095,6 +1099,7 @@ export default {
             this.pass.fName = this.nothing[0] + "..."
           }
           this.DzfeeList = this.DzfeeList.concat(this.selection)
+          console.log(this.selection)
           this.queryParams.tMblno = this.pass.fMblno //提单号
           this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
           this.queryParams.fCtrlcorpid = this.pass.fName

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2281,23 +2281,9 @@
       },
       /** 新增按钮操作 */
       handleAdd() {
-        this.form = {
-          fCorpid:'',
-          fTocorpid:'',
-          fBillno:'',
-          fBsdate:'',
-          fChargedate:'',
-          fWarehouseid:'',
-          fStltypeid:'',
-          fFeetunit:'',
-          fTrademodeid:'',
-          fMblno:'',
-          fOriginalbillno:'',
-          orgStorageDate:''
-        }
+        this.reset()
         this.notChange = false
         this.browseStatus = false
-        this.reset()
         this.queryUser()
         this.open = true
         this.dataList = []
@@ -2394,9 +2380,9 @@
 
       /** 修改按钮操作 */
       handleUpdate(row, status) {
+        this.reset()
         this.notChange = false
         this.browseStatus = status
-        this.reset()
         const fId = row.fId || this.ids
         getGoodsTransfer(fId).then((response) => {
           this.form = response.data.warehousebills

src/views/warehouseBusiness/outStock/index.vue

@@ -3520,8 +3520,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
-      this.browseStatus = status;
       this.reset();
+      this.browseStatus = status;
       this.queryUser();
       this.open = true;
       this.detailsHidden = false;

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2403,6 +2403,7 @@ export default {
     Jump(){
       this.approval = this.$route.query.data
       if(this.approval){
+        this.reset()
         this.colseButton = false
         this.approval = JSON.parse(this.approval)
         this.hide = false
@@ -2412,8 +2413,6 @@ export default {
         this.approve = true
         this.disappear = true
         this.cancelButton = false
-
-        this.reset()
         getStockTransfer(this.approval.billId).then((response) => {
           if (response.data.warehousebills) {
             this.form = response.data.warehousebills;
@@ -3093,23 +3092,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
-      this.form = {
-        fCorpid: '',
-        fTocorpid: '',
-        fBillno: '',
-        fBsdate: '',
-        fChargedate: '',
-        fWarehouseid: '',
-        fStltypeid: '',
-        fFeetunit: '',
-        fTrademodeid: '',
-        fMblno: '',
-        fOriginalbillno: '',
-        orgStorageDate: ''
-      }
+      this.reset();
       this.browseStatus = status;
       this.notChange = false
-      this.reset();
       this.queryUser();
       this.open = true;
       this.detailsHidden = false;
@@ -3196,10 +3181,10 @@ export default {
     },
 
     check(row,status,res){
+      this.reset();
       this.disappear = false
       this.notChange = true
       this.browseStatus = status;
-      this.reset();
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -425,7 +425,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="fBillno"
+            prop="srcBillNo"
             header-align="center"
             align="center"
             width="140px"
@@ -433,28 +433,12 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsid"
+            prop="fProductName"
             header-align="center"
             align="center"
             width="140px"
             label="货物名称"
           >
-            <template slot-scope="scope">
-              <el-select
-                v-model="scope.row.fGoodsid"
-                filterable
-                disabled
-                remote
-                placeholder="请选择品名"
-              >
-                <el-option
-                  v-for="(dict, index) in goodsOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
-            </template>
           </el-table-column>
           <el-table-column
             prop="fMarks"
@@ -788,6 +772,56 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="fMblno"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="提单号"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fMblno"
+                :disabled="browseStatus"
+                placeholder="提单号"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="fProductName"
+            header-align="center"
+            align="center"
+            width="140px"
+            label="品名"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fProductName"
+                :disabled="browseStatus"
+                placeholder="品名"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="品牌"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fMarks"
+                :disabled="browseStatus"
+                placeholder="品牌"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="remark"
             header-align="center"
             align="center"
@@ -821,12 +855,12 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" v-if="form.fBillstatus == '6'" @click="backrRconciliation">撤销请核</el-button>
+        <el-button type="success" v-if="form.fBillstatus === 6" @click="backrRconciliation">撤销请核</el-button>
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>
         <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
-        <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4' && Operator == Lander" @click="backApproval">撤销审批</el-button>
+        <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus === '4' && Operator === Lander" @click="backApproval">撤销审批</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
         <el-button
           :disabled="browseStatus"
@@ -1059,13 +1093,13 @@
       Jump(){
         this.approval = this.$route.query.data
         if (this.approval){
+          this.reset()
           this.Xbutton = false
           this.approval = JSON.parse(this.approval)
           // this.hide = false
           this.notChange = true
           this.approve = true
           this.cancelButton = false
-          this.reset()
           getStorageFeeCalculation(this.approval.billId).then(response => {
             this.fMblnoOptions = []
             if (response.data.corps) {
@@ -1084,14 +1118,10 @@
                 this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
                 this.$set(this.dataList[li], 'fStorageFeeDeadline', Date.parse(this.dataList[li].fStorageFeeDeadline))
               }
-              console.log(this.dataList)
             }
             if (response.data.warehouseFeesList) {
               this.warehouseDrList = response.data.warehouseFeesList
             }
-            if (response.data.goodsList) {
-              this.goodsOptions = response.data.goodsList
-            }
             if (response.data.feesList) {
               this.fWbuOptions = response.data.feesList
             }
@@ -1136,7 +1166,6 @@
         this.addOrUpdateVisib = false
         let id = '448'
         let actId = '110'
-        console.log(this.form.fId)
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(this.form.fId,this.actId)
         })
@@ -1309,7 +1338,6 @@
         this.fWbuOptions = [];
         this.fMblnoOptions = [];
         this.disappear = false
-        this.cancelButton = false
         this.addOrUpdateVisib = false
         this.addOrUpdateVisible = false
         this.notChange = false
@@ -1336,8 +1364,8 @@
       },
       /** 新增按钮操作 */
       handleAdd(status) {
-        this.browseStatus = status;
         this.reset();
+        this.browseStatus = status;
         this.queryUser();
         this.open = true;
         this.dataList = [];
@@ -1347,13 +1375,11 @@
         this.title = "出库单";
       },
       handleUpdate_s(row, status) {
-        this.disappear = true
+        this.reset();
         this.notChange = true
         this.browseStatus = status;
-        this.reset();
         let data = row || this.ids;
         getStorageFeeCalculation(data.fId).then((response) => {
-
           this.fMblnoOptions = []
           if (response.data.corps) {
             this.fMblnoOptions.push(response.data.corps)
@@ -1372,35 +1398,27 @@
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
               this.$set(this.dataList[li], 'fStorageFeeDeadline', Date.parse(this.dataList[li].fStorageFeeDeadline))
             }
-            console.log(this.dataList)
           }
           if (response.data.warehouseFeesList) {
             this.warehouseDrList = response.data.warehouseFeesList
           }
-          if (response.data.goodsList) {
-            this.goodsOptions = response.data.goodsList
-          }
           if (response.data.feesList) {
             this.fWbuOptions = response.data.feesList
           }
           this.userOptions = response.data.sysUser;
           this.open = true;
           this.title = "编辑仓储费计算";
-          console.log(this.Operator)
-          console.log(this.Lander)
         });
 
       },
-
       /** 修改按钮操作 */
       handleUpdate(row, status) {
+        this.reset();
         this.disappear = false
         this.notChange = true
         this.browseStatus = status;
-        this.reset();
         let data = row || this.ids;
         getStorageFeeCalculation(data.fId).then((response) => {
-
           this.fMblnoOptions = []
           if (response.data.corps) {
             this.fMblnoOptions.push(response.data.corps)
@@ -1419,22 +1437,16 @@
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
               this.$set(this.dataList[li], 'fStorageFeeDeadline', Date.parse(this.dataList[li].fStorageFeeDeadline))
             }
-            console.log(this.dataList)
           }
           if (response.data.warehouseFeesList) {
             this.warehouseDrList = response.data.warehouseFeesList
           }
-          if (response.data.goodsList) {
-            this.goodsOptions = response.data.goodsList
-          }
           if (response.data.feesList) {
             this.fWbuOptions = response.data.feesList
           }
           this.userOptions = response.data.sysUser;
           this.open = true;
           this.title = "编辑仓储费计算";
-          console.log(this.Operator)
-          console.log(this.Lander)
         });
 
       },
@@ -1633,10 +1645,14 @@
             formData.append("warehouseFees", JSON.stringify(this.warehouseDrList));
             addStorageFeeCalculation(formData).then((response) => {
               this.msgSuccess("操作成功");
-              if (status === 2) {
+              if (status !== 2) {
                 this.open = false;
                 this.reset()
                 this.getList();
+              } else {
+                this.form = response.data
+                this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+                this.$set(this.form, 'fBillingDeadline', Date.parse(this.form.fBillingDeadline))
               }
             })
           }