caojunjie 2 年之前
父節點
當前提交
9debb9b7fe

+ 9 - 3
src/views/exportTrade/invoice/detailsPage.vue

@@ -117,11 +117,17 @@
               @click.stop="openReport()"
               >报表打印</el-button
             >
-            <el-button :type="!form.customsStatus?'info':'primary'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 1"
+<!--            <el-button :type="!form.customsStatus?'info':'primary'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 1"-->
+<!--            >已报关</el-button>-->
+<!--            <el-button :type="!form.shippingStatus?'info':'warning'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 2"-->
+<!--            >已出运</el-button>-->
+<!--            <el-button :type="form.documentaryStatus == '已寄单'?'success':'info'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 3"-->
+<!--            >已寄单</el-button>-->
+            <el-button :type="!form.customsStatus?'info':'primary'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1"
             >已报关</el-button>
-            <el-button :type="!form.shippingStatus?'info':'warning'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 2"
+            <el-button :type="!form.shippingStatus?'info':'warning'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2"
             >已出运</el-button>
-            <el-button :type="form.documentaryStatus == '已寄单'?'success':'info'" size="small" :disabled="!form.id||form.estimateGoodGoods !='货备齐'" @click.native="dialog = true;fudaSatus = 3"
+            <el-button :type="form.documentaryStatus == '已寄单'?'success':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 3"
             >已寄单</el-button>
           </template>
           <template slot-scope="{ row }" slot="corpId">

+ 2 - 2
src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -182,9 +182,9 @@
                 size="small"
                 @click.stop="openReport()"
                 >报表打印</el-button>
-              <el-button :type="form.productionScheduling?'success':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1"
+              <el-button :type="form.productionScheduling?'info':'success'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1"
               >排产中</el-button>
-              <el-button :type="form.estimateGoodGoods?'success':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2"
+              <el-button :type="form.estimateGoodGoods?'info':'success'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2"
               >预计货好</el-button>
               <el-button type="info" size="small" :disabled="!form.id || form.fudaPurchaseStatus != '采购中'" @click.native="dialog = true;fudaSatus = 3"
               >货备齐</el-button>

+ 1 - 1
src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -20,7 +20,7 @@
           </el-button>
           <el-button :type="form.fudaPurchaseStatus?'success':'warning'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1">通知采购</el-button>
           <el-button :type="form.documentaryStatus?'primary':'warning'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2">通知跟单</el-button>
-          <el-button type="primary" size="small" :disabled="form.status > 0 || !form.status" @click.native="pleaseCheck">请核数据</el-button>
+          <el-button type="primary" size="small" :disabled="form.status > 0 || (!form.status && form.status !== 0)" @click.native="pleaseCheck">请核数据</el-button>
         </el-row>
       </template>
       <template slot="headerSerial">

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

@@ -57,8 +57,8 @@
                 <div class="content-item">
                     <div class="card">
                         <div class="card-content">
-                            <span class="card-content-num" :class="form.productionScheduling?'selected':''">{{
-                                form.productionScheduling ? form.productionScheduling : '定金到账'
+                            <span class="card-content-num" :class="form.depositReceived?'selected':''">{{
+                                form.depositReceived ? form.depositReceived : '定金到账'
                                 }}</span>
                         </div>
                     </div>
@@ -87,8 +87,8 @@
                 <div class="content-item">
                     <div class="card">
                         <div class="card-content">
-                            <span class="card-content-num" :class="form.depositReceived?'selected':''">{{
-                                form.depositReceived ? form.depositReceived : '尾款'
+                            <span class="card-content-num" :class="form.balancePayment?'selected':''">{{
+                                form.balancePayment ? form.balancePayment : '尾款'
                                 }}</span>
                         </div>
                     </div>

+ 2 - 2
vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.106:1080',
+        target: 'http://192.168.0.106:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {