#96987

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.174:8080/cfg?key=test_174"
+    "apiUrl": "http://192.168.30.125:8080/cfg?key=test_125"
 }

src/views/business/sell/components/funds/index.vue

@@ -34,7 +34,7 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="销售方">
+            <a-form-item label="采购方">
               <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
             </a-form-item>
           </a-col>
@@ -75,12 +75,13 @@
           <a-col :span="12">
             <a-form-item label="货款总额">
               <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}</span>
+                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin }}</span>
+              <span
+                    class="white">{{ selectedRow.margin }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -88,25 +89,29 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="其他费用">
-              <span class="white">{{ selectedRow.reckonotheramount }}</span>
+              <span
+                    class="white">{{ selectedRow.reckonotheramount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
-              <span class="white">{{ formatValue(selectedRow.totalamount) }}</span>
+              <span
+                    class="white">{{ formatValue(selectedRow.totalamount) }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="已支付额">
-              <span class="white">{{ selectedRow.payamount }}</span>
+            <a-form-item label="已收付额">
+              <span
+                    class="white">{{ selectedRow.payamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="预计款额">
-              <span class="white">{{ selectedRow.prepayamount }}</span>
+            <a-form-item label="预收款额">
+              <span
+                    class="white">{{ selectedRow.prepayamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -121,7 +126,7 @@
               :rules="rules">
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="应付款额"
+            <a-form-item label="应收款额"
                          name="unpayamount">
               <span class="white">{{selectedRow.unpayamount}}</span>
             </a-form-item>
@@ -130,8 +135,8 @@
             <a-form-item label="款项类型">
               <a-radio-group class="commonRadioGroup"
                              v-model:value="formState.payType">
-                <a-radio :value="1">付款申请</a-radio>
-                <a-radio :value="2">退款通知</a-radio>
+                <a-radio :value="1">收款通知</a-radio>
+                <a-radio :value="2">退款申请</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
@@ -147,6 +152,7 @@
                               type="number"
                               placeholder="请输入登记金额"
                               v-model:value="formState.Amount" />
+              {{handleCurrencyname(selectedRow.currencyname)}}
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -205,7 +211,9 @@ export default defineComponent({
                 });
             });
         }
-
+        function handleCurrencyname(currencyname: string) {
+            return currencyname === '人民币' ? '' : currencyname;
+        }
         return {
             visible,
             cancel,
@@ -216,6 +224,7 @@ export default defineComponent({
             formRef,
             rules,
             getPriceTypeName,
+            handleCurrencyname,
         };
     },
 });

src/views/business/sell/components/invoice/index.vue

@@ -34,7 +34,7 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item :label="'销售方'">
+            <a-form-item :label="'采购方'">
               <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
             </a-form-item>
           </a-col>
@@ -53,40 +53,43 @@
           <a-col :span="12">
             <a-form-item label="贷款总额">
               <span
-                    class="white">{{ formatValue(selectedRow.loanamount) + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.loanamount) + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
               <span
-                    class="white">{{ formatValue(selectedRow.margin) + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.margin) + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonotheramount + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
-              <span class="white">{{ selectedRow.totalamount + selectedRow.currencyname }}</span>
+              <span
+                    class="white">{{ selectedRow.totalamount + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="已支付额 ">
-              <span class="white">{{ selectedRow.payamount + selectedRow.currencyname }}</span>
+            <a-form-item label="已收额 ">
+              <span
+                    class="white">{{ selectedRow.payamount + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="已收票额">
-              <span class="white">{{ selectedRow.invoiceamount + selectedRow.currencyname }}</span>
+            <a-form-item label="已开票额">
+              <span
+                    class="white">{{ selectedRow.invoiceamount + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="预收票额">
+            <a-form-item label="预开票额">
               <span
-                    class="white">{{ selectedRow.preinvoiceamount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.preinvoiceamount + handleCurrencyname(selectedRow.currencyname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -110,7 +113,8 @@
                               :min="0"
                               placeholder="请输入收票金额" />
               <div class="tip">
-                <div>应收票额：{{ selectedRow.invoiceamount }} {{ selectedRow.currencyname }}</div>
+                <div>应开票额：{{ selectedRow.invoiceamount }}
+                  {{ handleCurrencyname(selectedRow.currencyname) }}</div>
                 <div><a class="blue fr">全部登记</a></div>
               </div>
             </a-form-item>
@@ -118,12 +122,8 @@
           <a-col :span="12">
             <a-form-item label="发票附件"
                          class="mb40">
-              <div class="upload">
-                <a-upload action="">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
+              <UploadImg :visible="visible"
+                         @upload="uploadImgAction" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -141,10 +141,13 @@ import { handleForm } from '@/views/business/purchase/components/invoice/setup';
 import { InvoiceReq } from '@/services/proto/contract/interface';
 import { invoiceReq } from '@/views/business/purchase/components/setup';
 import { _closeModal } from '@/common/setup/modal/modal';
+import UploadImg from '@/common/components/uploadImg/index.vue';
+import { getUploadImg } from '@/common/setup/upload';
 
 export default defineComponent({
     name: 'sell_pending_invoice',
     emits: ['cancel', 'update'],
+    components: { UploadImg },
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,
@@ -155,7 +158,7 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const { rules, formState, formRef } = handleForm();
-
+        const { getFirstImg, uploadImgAction } = getUploadImg();
         function submit() {
             const wrapEl = unref(formRef);
             wrapEl.validate().then(() => {
@@ -171,7 +174,9 @@ export default defineComponent({
                     .catch((err) => {});
             });
         }
-
+        function handleCurrencyname(currencyname: string) {
+            return currencyname === '人民币' ? '' : currencyname;
+        }
         return {
             visible,
             cancel,
@@ -182,6 +187,8 @@ export default defineComponent({
             formatValue,
             rules,
             getPriceTypeName,
+            handleCurrencyname,
+            uploadImgAction,
         };
     },
 });