qukaidi 3 anni fa
parent
commit
0691e2e883

+ 4 - 5
src/views/purchase/contract/detailsPage.vue

@@ -236,11 +236,10 @@
             </template>
           </avue-crud>
         </trade-card>
-        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled"
-          :financeDisabled="form.status != 3" :itemType="'申请'" activeName="second" :optionType="'JK'"
-          @beforeFinance="beforeFinance" @afterFinance="afterFinance" @getBillNo="getBillNo"
-          feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList"
-          :delType="2" />
+        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
+          activeName="second" :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
+          @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId"
+          :billNoList="billNoList" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled" :orderFilesList="orderFilesList"
           delUrl="" />
       </el-form>

+ 4 - 4
src/views/salesManagement/salesContract/detailsPage.vue

@@ -193,7 +193,7 @@
                 :disabled="selection.length ==0|| form.status!=1 " @click="generateShipmentD">生成发货单
               </el-button>-->
               <el-button type="warning" size="small" :loading="buttonLoading" @click="generateShipmentD"
-                :disabled="selection.length === 0 || form.status != 3">生成发货单
+                :disabled="selection.length === 0">生成发货单
               </el-button>
               <!--              <el-button type="info"
                          size="small"
@@ -213,7 +213,7 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" @beforeFinance="beforeFinance" @afterFinance="afterFinance" :disabled="viewDisabled"
-          :financeDisabled="form.status != 3" :orderFeesList="orderFeesList" :itemType="'收费'" optionType="'JK'"
+          :orderFeesList="orderFeesList" :itemType="'收费'" :optionType="'JK'"
           feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled"
           :orderFilesList="orderFilesList || viewDisabled" delUrl="" />
@@ -614,8 +614,8 @@ export default {
       })
     }
     if (!this.detailData.id) {
-      this.form.currency="USD"
-     this.currencyChange("USD")
+      this.form.currency = "USD"
+      this.currencyChange("USD")
     }
   },
   methods: {