仓储模块作业费修改

src/views/warehouseBusiness/inStock/index.vue

@@ -3629,6 +3629,9 @@ export default {
             fCurrency: "RMB",
             fExrate: "1",
             fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           });
         }
         for (let list in this.warehouseDrList) {
@@ -3667,6 +3670,9 @@ export default {
             fCurrency: "RMB",
             fExrate: "1",
             fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           });
         }
         for (let list in this.warehouseCrList) {

src/views/warehouseBusiness/outStock/index.vue

@@ -3052,6 +3052,9 @@ export default {
             fExrate: 1,
             fAmount: fAmount,
             fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           })
           console.log(this.fQty)
         } else {
@@ -3064,7 +3067,10 @@ export default {
             fCurrency: 'RMB',
             fExrate: 1,
             fAmount: fAmount,
-            fTaxrate: this.fTaxrate
+            fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           })
         }
       }

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2735,7 +2735,10 @@ export default {
             fCurrency: 'RMB',
             fExrate: 1,
             fAmount: fAmount,
-            fTaxrate: this.fTaxrate
+            fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           })
         } else {
           this.warehouseDrList.push({
@@ -2747,7 +2750,10 @@ export default {
             fCurrency: 'RMB',
             fExrate: 1,
             fAmount: fAmount,
-            fTaxrate: this.fTaxrate
+            fTaxrate: this.fTaxrate,
+            fMblno:this.form.fMblno,
+            fProductName:this.form.fProductName,
+            fMarks:this.form.fMarks
           })
         }
       }

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -577,283 +577,283 @@
           </el-table-column>
         </el-table>
       </div>
-      <div>
-        <el-button :disabled="browseStatus" @click.prevent="addCollection()"
-        >新行
-        </el-button>
-        <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
-      </div>
-      <div style="font-size:18px">应收款明细</div>
-      <div class="dialogTableTitle flex a-center jlr"
-           style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
-        <el-table
-          :data="warehouseDrList"
-          ref="table"
-          tooltip-effect="dark"
-          border
-          stripe
-          show-summary
-          :summary-method="warehouseDrSummaries"
-        >
-          <el-table-column label="序号" type="index" width="80">
-          </el-table-column>
-          <el-table-column
-            prop="fCorpid"
-            header-align="center"
-            align="center"
-            width="180px"
-            label="客户名称"
-          >
-            <template slot-scope="scope">
-              <el-select
-                v-model="scope.row.fCorpid"
-                filterable
-                remote
-                :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="客户名称"
-              >
-                <el-option
-                  v-for="(dict, index) in fMblnoOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fFeeid"
-            header-align="center"
-            align="center"
-            width="180px"
-            label="费用名称"
-          >
-            <template slot-scope="scope">
-              <el-select
-                v-model="scope.row.fFeeid"
-                filterable
-                remote
-                :disabled="browseStatus"
-                :remote-method="fWRemoteMethod"
-                placeholder="费用名称"
-              >
-                <el-option
-                  v-for="dict in fWbuOptions"
-                  :key="dict.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fFeeunitid"
-            header-align="center"
-            align="center"
-            width="180px"
-            label="计价单位"
-          >
-            <template slot-scope="scope">
-              <el-select
-                v-model="scope.row.fFeeunitid"
-                placeholder="请选择计价单位"
-                :disabled="browseStatus"
-                clearable
-              >
-                <el-option
-                  v-for="dict in fFeetunitOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fQty"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="数量"
-          >
-            <template slot-scope="scope">
-              <el-input
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
-                v-model="scope.row.fQty"
-                @change="changeEstmateAmt(scope.row)"
-                :disabled="browseStatus"
-                placeholder="数量"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fUnitprice"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="单价"
-          >
-            <template slot-scope="scope">
-              <el-input
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                v-model="scope.row.fUnitprice"
-                @change="changeEstmateAmt(scope.row)"
-                :disabled="browseStatus"
-                placeholder="单价"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fAmount"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="金额"
-          >
-            <template slot-scope="scope">
-              <el-input
-                disabled
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                v-model="scope.row.fAmount"
-                placeholder="金额"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fCurrency"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="币别"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fCurrency"
-                :disabled="browseStatus"
-                placeholder="币别"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fExrate"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="汇率"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fExrate"
-                :disabled="browseStatus"
-                placeholder="汇率"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="fTaxrate"
-            header-align="center"
-            align="center"
-            width="150px"
-            label="税率"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fTaxrate"
-                :disabled="browseStatus"
-                placeholder="税率"
-                show-word-limit
-              />
-            </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>
+<!--      <div>-->
+<!--        <el-button :disabled="browseStatus" @click.prevent="addCollection()"-->
+<!--        >新行-->
+<!--        </el-button>-->
+<!--        <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>-->
+<!--      </div>-->
+<!--      <div style="font-size:18px">应收款明细</div>-->
+<!--      <div class="dialogTableTitle flex a-center jlr"-->
+<!--           style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">-->
+<!--        <el-table-->
+<!--          :data="warehouseDrList"-->
+<!--          ref="table"-->
+<!--          tooltip-effect="dark"-->
+<!--          border-->
+<!--          stripe-->
+<!--          show-summary-->
+<!--          :summary-method="warehouseDrSummaries"-->
+<!--        >-->
+<!--          <el-table-column label="序号" type="index" width="80">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fCorpid"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="180px"-->
+<!--            label="客户名称"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-select-->
+<!--                v-model="scope.row.fCorpid"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                :disabled="browseStatus"-->
+<!--                :remote-method="corpsRemoteMethod"-->
+<!--                placeholder="客户名称"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="(dict, index) in fMblnoOptions"-->
+<!--                  :key="index.fId"-->
+<!--                  :label="dict.fName"-->
+<!--                  :value="dict.fId"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fFeeid"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="180px"-->
+<!--            label="费用名称"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-select-->
+<!--                v-model="scope.row.fFeeid"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                :disabled="browseStatus"-->
+<!--                :remote-method="fWRemoteMethod"-->
+<!--                placeholder="费用名称"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="dict in fWbuOptions"-->
+<!--                  :key="dict.fId"-->
+<!--                  :label="dict.fName"-->
+<!--                  :value="dict.fId"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fFeeunitid"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="180px"-->
+<!--            label="计价单位"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-select-->
+<!--                v-model="scope.row.fFeeunitid"-->
+<!--                placeholder="请选择计价单位"-->
+<!--                :disabled="browseStatus"-->
+<!--                clearable-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="dict in fFeetunitOptions"-->
+<!--                  :key="dict.dictValue"-->
+<!--                  :label="dict.dictLabel"-->
+<!--                  :value="dict.dictValue"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fQty"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="数量"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'-->
+<!--                v-model="scope.row.fQty"-->
+<!--                @change="changeEstmateAmt(scope.row)"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="数量"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fUnitprice"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="单价"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                v-model="scope.row.fUnitprice"-->
+<!--                @change="changeEstmateAmt(scope.row)"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="单价"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fAmount"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="金额"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                disabled-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                v-model="scope.row.fAmount"-->
+<!--                placeholder="金额"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fCurrency"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="币别"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fCurrency"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="币别"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fExrate"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="汇率"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fExrate"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="汇率"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="fTaxrate"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150px"-->
+<!--            label="税率"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fTaxrate"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="税率"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </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="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"
-            width="150px"
-            label="备注"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.remark"
-                :disabled="browseStatus"
-                placeholder="备注"
-                show-word-limit
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            header-align="center"
-            align="center"
-            width="200px"
-            label="操作"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
-                size="small"
-              >移除
-              </el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+<!--          <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"-->
+<!--            width="150px"-->
+<!--            label="备注"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.remark"-->
+<!--                :disabled="browseStatus"-->
+<!--                placeholder="备注"-->
+<!--                show-word-limit-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="200px"-->
+<!--            label="操作"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"-->
+<!--                size="small"-->
+<!--              >移除-->
+<!--              </el-button-->
+<!--              >-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </div>-->
       <div slot="footer" class="dialog-footer">
         <el-button type="success" v-if="form.fBillstatus === 6" @click="backrRconciliation">撤销请核</el-button>
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>