浏览代码

修改作业费按钮显示问题

lichao 3 年之前
父节点
当前提交
fcbe581236

+ 9 - 7
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1146,7 +1146,6 @@
             <el-button
               size="small"
               @click.prevent="handleSelect(3)"
-              :disabled="browseStatus"
               type="danger"
               >作业费协议</el-button
             >
@@ -1448,7 +1447,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
 
@@ -1473,6 +1473,7 @@
             align="center"
             label="操作"
             width="200px"
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -1521,7 +1522,6 @@
               type="danger"
               size="small"
               @click.prevent="handleSelect(1)"
-              :disabled="browseStatus"
               >作业费协议</el-button
             >
             <el-button
@@ -1830,7 +1830,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -1854,6 +1855,7 @@
             align="center"
             width="200px"
             label="操作"
+            fixed="right"
           >
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
@@ -2550,7 +2552,7 @@
         @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
           @click="
             warehousingagreements = false;
@@ -4789,7 +4791,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           } else {
             this.warehouseCrList.push({
@@ -4806,7 +4808,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           }
         });

+ 5 - 4
src/views/Warehousing/components/incomeMoney.vue

@@ -28,7 +28,6 @@
         <el-button
             size="small"
             @click.prevent="handleSelect()"
-            :disabled="browseStatus"
             type="danger"
         >作业费协议
         </el-button>
@@ -334,7 +333,8 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-          <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+          <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+          <span v-if="scope.row.fSrcTypeId == 10">变更</span>
         </template>
       </el-table-column>
       <span v-if="feeDisplay">
@@ -509,6 +509,7 @@
           align="center"
           label="操作"
           width="200px"
+          fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -638,7 +639,7 @@
           @pagination="getWhgenlegList"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
             @click="
             warehousingagreements = false;
@@ -893,7 +894,7 @@ export default {
             fProductName: this.form.fProductName,
             fMarks: this.form.fMarks,
             fBusinessType: this.form.fBusinessType,
-            fSrcTypeId: e.fId,
+            fSrcTypeId: 1,
           });
         });
 

+ 5 - 4
src/views/Warehousing/components/payMoney.vue

@@ -28,7 +28,6 @@
           type="danger"
           size="small"
           @click.prevent="handleSelect"
-          :disabled="browseStatus"
           >作业费协议</el-button
         >
         <el-button
@@ -331,7 +330,8 @@
       >
         <template slot-scope="scope">
           <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-          <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+          <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+          <span v-if="scope.row.fSrcTypeId == 10">变更</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -355,6 +355,7 @@
         align="center"
         width="200px"
         label="操作"
+        fixed="right"
       >
         <template slot-scope="scope">
           <!-- <el-button size="small">审核费用</el-button> -->
@@ -485,7 +486,7 @@
         @pagination="getWhgenlegList"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
           @click="
             warehousingagreements = false;
@@ -723,7 +724,7 @@ export default {
             fProductName: this.form.fProductName,
             fMarks: this.form.fMarks,
             fBusinessType: this.form.fBusinessType,
-            fSrcTypeId: e.fId,
+            fSrcTypeId: 1,
           });
         });
         this.warehousingagreements = false;

+ 9 - 7
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -656,7 +656,6 @@
             <el-button
               size="small"
               @click.prevent="handleSelect(3)"
-              :disabled="browseStatus"
               type="danger"
               >作业费协议</el-button
             >
@@ -958,7 +957,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
 
@@ -983,6 +983,7 @@
             align="center"
             label="操作"
             width="200px"
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -1041,7 +1042,6 @@
               type="danger"
               size="small"
               @click.prevent="handleSelect(1)"
-              :disabled="browseStatus"
               >作业费协议</el-button
             >
             <el-button
@@ -1350,7 +1350,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -1374,6 +1375,7 @@
             align="center"
             width="200px"
             label="操作"
+            fixed="right"
           >
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
@@ -1704,7 +1706,7 @@
         @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
           @click="
             warehousingagreements = false;
@@ -3753,7 +3755,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           } else {
             this.warehouseCrList.push({
@@ -3770,7 +3772,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           }
         });

+ 9 - 7
src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -2085,7 +2085,6 @@
             <el-button
                 size="small"
                 @click.prevent="handleSelect(3)"
-                :disabled="browseStatus"
                 type="danger"
             >作业费协议
             </el-button>
@@ -2394,7 +2393,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
 
@@ -2574,6 +2574,7 @@
               align="center"
               label="操作"
               width="200px"
+              fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -2624,7 +2625,6 @@
                 type="danger"
                 size="small"
                 @click.prevent="handleSelect(1)"
-                :disabled="browseStatus"
             >作业费协议
             </el-button
             >
@@ -2934,7 +2934,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -2958,6 +2959,7 @@
               align="center"
               width="200px"
               label="操作"
+              fixed="right"
           >
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
@@ -4352,7 +4354,7 @@
           @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
             @click="
             warehousingagreements = false;
@@ -7287,7 +7289,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           } else {
             this.warehouseCrList.push({
@@ -7304,7 +7306,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           }
         });

+ 7 - 8
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1235,7 +1235,6 @@
             <el-button
                 size="small"
                 @click.prevent="handleSelect(3)"
-                :disabled="browseStatus"
                 type="danger"
             >作业费协议
             </el-button>
@@ -1725,6 +1724,7 @@
               align="center"
               label="操作"
               width="200px"
+              fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -1784,7 +1784,6 @@
                 type="danger"
                 size="small"
                 @click.prevent="handleSelect(1)"
-                :disabled="browseStatus"
             >作业费协议
             </el-button
             >
@@ -2102,7 +2101,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -2126,6 +2126,7 @@
               align="center"
               width="200px"
               label="操作"
+              fixed="right"
           >
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
@@ -3687,7 +3688,7 @@
           @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
             @click="
             warehousingagreements = false;
@@ -6722,7 +6723,6 @@ export default {
           let fAmount = 0;
           fAmount = e.fPrice * qty;
           if (this.key_id == 3) {
-            console.log('乖乖齐齐')
             this.warehouseDrList.push({
               fQty: qty,
               fCorpid: e.fCorpid,
@@ -6737,12 +6737,11 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
               fBillingway: e.fFeeUnitid,
               remark: e.remark,
             });
           } else {
-            console.log('奇奇怪怪')
             this.warehouseCrList.push({
               fQty: qty,
               fCorpid: e.fCorpid,
@@ -6757,7 +6756,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           }
         });

+ 9 - 7
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -1472,7 +1472,6 @@
             <el-button
               size="small"
               @click.prevent="handleSelect(3)"
-              :disabled="browseStatus"
               type="danger"
               >作业费协议</el-button
             >
@@ -1774,7 +1773,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
 
@@ -1799,6 +1799,7 @@
             align="center"
             label="操作"
             width="200px"
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -1857,7 +1858,6 @@
               type="danger"
               size="small"
               @click.prevent="handleSelect(1)"
-              :disabled="browseStatus"
               >作业费协议</el-button
             >
             <el-button
@@ -2166,7 +2166,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -2190,6 +2191,7 @@
             align="center"
             width="200px"
             label="操作"
+            fixed="right"
           >
             <template slot-scope="scope">
               <!-- <el-button size="small">审核费用</el-button> -->
@@ -3000,7 +3002,7 @@
         @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="zhgenlegData">导 入</el-button>
+        <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
         <el-button
           @click="
             warehousingagreements = false;
@@ -5342,7 +5344,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           } else {
             this.warehouseCrList.push({
@@ -5359,7 +5361,7 @@ export default {
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
-              fSrcTypeId: e.fId,
+              fSrcTypeId: 1,
             });
           }
         });