提交福达

src/views/approveData/index.vue

@@ -46,6 +46,7 @@
         <span v-else-if="scope.row.checkType == 'HYJK-DJ'">海运进口</span>
         <span v-else-if="scope.row.checkType == 'HYJK-FY'">海运进口费用</span>
         <span v-else-if="scope.row.checkType == 'XSTD'">销售退单请核</span>
+        <span v-else-if="scope.row.checkType == 'YPJ-XSTH'">销售退款退货</span>
       </template>
       <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/exportTrade/invoice/detailsPage.vue

@@ -65,9 +65,12 @@
             <crop-select
               v-model="form.corpId"
               corpType="KH"
-              :disabled="detailData.status == 1"
+              disabled
             ></crop-select>
           </template>
+          <template slot="belongToCorpId">
+            <crop-select v-model="form.belongToCorpId" corpType="GS" disabled></crop-select>
+          </template>
           <template slot="storageId">
             <warehouse-select
               v-model="form.storageId"
@@ -114,11 +117,11 @@
               @click.stop="openReport()"
               >报表打印</el-button
             >
-            <el-button type="info" size="small" :disabled="!form.id || form.customsStatus" @click.native="dialog = true;fudaSatus = 1"
+            <el-button :type="!form.customsStatus?'info':'primary'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1"
             >已报关</el-button>
-            <el-button type="info" size="small" :disabled="!form.id || form.shippingStatus" @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="info" size="small" :disabled="!form.id || form.documentaryStatus != '跟单中'" @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">
@@ -329,6 +332,7 @@ import reportDialog from "@/components/report-dialog/main";
 import { micrometerFormat, IntegerFormat } from "@/util/validate";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
+import fa from "element-ui/src/locale/lang/fa";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -361,22 +365,36 @@ export default {
             prop: "corpId",
             rules: [
               {
-                required: true,
+                required: false,
                 message: "",
                 trigger: "blur"
               }
             ],
-            span: 16,
+            span: 8,
             slot: true
+          },{
+            label: "公司主体",
+            prop: "belongToCorpId",
+            disabled: true,
+            span: 8,
+            rules: [
+              {
+                required: false,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "系统号",
             prop: "sysNo",
+            disabled: true,
             span: 8
           },
           {
             label: "销售订单号",
             prop: "srcOrderNo",
+            disabled: true,
             span: 8
           },
           {
@@ -406,6 +424,8 @@ export default {
             label: "客户详情",
             prop: "clientMessage",
             span: 8,
+            type: "textarea",
+            minRows: 2,
             disabled: true,
           },{
             label: "订单日期",
@@ -418,6 +438,17 @@ export default {
             span: 8,
             disabled: true,
           },{
+            label: "联系人",
+            prop: "corpAttn",
+            disabled: true,
+            span: 8
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            disabled: true,
+            span: 8
+          },{
             label: "起运港",
             prop: "portOfLoad",
             span: 8,

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -18,8 +18,8 @@
           <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1"
             :loading="calculateLoading">分摊海运费
           </el-button>
-          <el-button type="info" size="small" :disabled="!form.id || form.fudaPurchaseStatus" @click.native="dialog = true;fudaSatus = 1">通知采购</el-button>
-          <el-button type="info" size="small" :disabled="!form.id || form.documentaryStatus" @click.native="dialog = true;fudaSatus = 2">通知跟单</el-button>
+          <el-button :type="form.fudaPurchaseStatus?'success':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1">通知采购</el-button>
+          <el-button :type="form.documentaryStatus?'warning':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2">通知跟单</el-button>
         </el-row>
       </template>
       <template slot="headerSerial">