fix

src/views/exportTrade/invoice/detailsPage.vue

@@ -11,30 +11,30 @@
           >返回列表
         </el-button>
       </div>
-      <el-button
-        type="info"
-        @click.stop="editCustomer('save')"
-        v-if="form.deliveryStatus == '录入'"
-        class="receipt-customer-btn"
-        >确认发货</el-button
-      >
-      <el-button
-        type="info"
-        @click.stop="editCustomer('repeal')"
-        v-if="form.deliveryStatus != '录入'"
-        class="receipt-customer-btn"
-        >撤销发货</el-button
-      >
-      <el-button type="success" class="copy-customer-btn" disabled>
-        复制新单
-      </el-button>
-      <el-button
-        class="el-button--small-yh add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer('submit')"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button
+          type="info"
+          @click.stop="editCustomer('save')"
+          v-if="form.deliveryStatus == '录入'"
+          >确认发货</el-button
+        >
+        <el-button
+          type="info"
+          @click.stop="editCustomer('repeal')"
+          v-if="form.deliveryStatus != '录入'"
+          >撤销发货</el-button
+        >
+        <el-button type="success" disabled>
+          复制新单
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled"
+          @click="editCustomer('submit')"
+          v-if="detailData.status != 1"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
@@ -288,6 +288,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
+        disabled:false,
         column: [
           {
             label: "客户名称",

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -10,16 +10,18 @@
           >返回列表
         </el-button>
       </div>
-      <el-button type="success" class="copy-customer-btn" disabled>
-        复制新单
-      </el-button>
-      <el-button
-        class="el-button--small-yh add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button type="success" disabled>
+          复制新单
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled"
+          @click="editCustomer"
+          v-if="detailData.status != 1"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
@@ -302,6 +304,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
+        disabled:false,
         column: [
           {
             label: "客户名称",

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -11,41 +11,32 @@
           >返回列表
         </el-button>
       </div>
-      <el-button
-        class="submit-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer('submit')"
-        >提交
-      </el-button>
-      <el-button
-        class="add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer('save')"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button
+          type="primary"
+          :disabled="detailData.status == 1"
+          v-if="detailData.status != 1"
+          @click="editCustomer('submit')"
+          >提交
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="detailData.status == 1"
+          @click="editCustomer('save')"
+          v-if="detailData.status != 1"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container style="margin-bottom: 10px">
         <avue-form ref="form" v-model="form" :option="option">
-          <template slot="portOfLoad">
-            <port-info
-              v-model="form.portOfLoad"
-              :disabled="$route.query.status == 1"
-            />
-          </template>
-          <template slot="portOfDestination">
-            <port-info
-              v-model="form.portOfDestination"
-              :disabled="$route.query.status == 1"
-            />
-          </template>
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
               :configuration="configuration"
+              :disabled="detailData.status == 1"
             ></select-component>
           </template>
         </avue-form>
@@ -65,7 +56,7 @@
               size="small"
               type="text"
               @click="rePick(row, index)"
-              :disabled="disabled"
+              :disabled="detailData.status == 1"
               class="picker"
               style="padding:4px 10px;float:left"
               >选择</el-button
@@ -144,6 +135,7 @@
               icon="el-icon-plus"
               size="small"
               @click.stop="newDetails"
+              :disabled="detailData.status == 1"
               >新增明细</el-button
             >
             <el-button
@@ -151,6 +143,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
+              :disabled="detailData.status == 1"
               >报 表</el-button
             >
           </template>
@@ -160,7 +153,7 @@
               icon="el-icon-edit"
               type="text"
               @click="rowCell(row, index)"
-              :disabled="disabled"
+              :disabled="detailData.status == 1"
               >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
@@ -272,6 +265,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
+        disabled:false,
         column: [
           {
             label: "客户名称",

src/views/exportTrade/receipt/detailsPage.vue

@@ -11,30 +11,30 @@
           >返回列表
         </el-button>
       </div>
-      <el-button
-        type="info"
-        @click.stop="editCustomer('save')"
-        v-if="form.deliveryStatus == '录入'"
-        class="receipt-customer-btn"
-        >确认收货</el-button
-      >
-      <el-button
-        type="info"
-        @click.stop="editCustomer('repeal')"
-        v-if="form.deliveryStatus == '已收货'"
-        class="receipt-customer-btn"
-        >撤销收货</el-button
-      >
-      <el-button type="success" class="copy-customer-btn" disabled>
-        复制新单
-      </el-button>
-      <el-button
-        class="el-button--small-yh add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer('submit')"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button
+          type="info"
+          @click.stop="editCustomer('save')"
+          v-if="form.deliveryStatus == '录入'"
+          >确认收货</el-button
+        >
+        <el-button
+          type="info"
+          @click.stop="editCustomer('repeal')"
+          v-if="form.deliveryStatus == '已收货'"
+          >撤销收货</el-button
+        >
+        <el-button type="success" disabled>
+          复制新单
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled"
+          @click="editCustomer('submit')"
+          v-if="detailData.status != 1"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
@@ -301,6 +301,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
+        disabled:false,
         column: [
           {
             label: "客户名称",

src/views/exportTrade/receipt/index.vue

@@ -206,12 +206,12 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       if (params.businessDate) {
-        params.orderStartDate = params.businessDate[0];
-        params.orderEndDate = params.businessDate[1];
+        params.businessStartDate = params.businessDate[0];
+        params.businessEndDate = params.businessDate[1];
       }
       if (params.createTime) {
-        params.createTimeStart = params.createTime[0];
-        params.createTimeEnd = params.createTime[1];
+        params.createStartTime = params.createTime[0];
+        params.createEndTime = params.createTime[1];
       }
       delete params.businessDate;
       delete params.createTime;
@@ -230,8 +230,8 @@ export default {
       if (this.search.businessDate && this.search.businessDate.length > 0) {
         params = {
           ...params,
-          orderStartDate: this.search.businessDate[0],
-          orderEndDate: this.search.businessDate[1]
+          businessStartDate: this.search.businessDate[0],
+          businessEndDate: this.search.businessDate[1]
         };
         delete params.businessDate;
       }

src/views/exportTrade/salesContract/detailsPage.vue

@@ -10,19 +10,19 @@
           >返回列表
         </el-button>
       </div>
-      <el-button type="info" class="sell-customer-btn" @click="saveSell"
-        >生成采购单</el-button
-      >
-      <el-button type="success" class="copy-customer-btn" disabled>
-        复制新单
-      </el-button>
-      <el-button
-        class="el-button--small-yh add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button type="info" @click="saveSell">生成采购单</el-button>
+        <el-button type="success" disabled>
+          复制新单
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled"
+          @click="editCustomer"
+          v-if="detailData.status != 1"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>

src/views/exportTrade/shippingInquiry/config/freight.json

@@ -28,21 +28,28 @@
       "cell": true
     },
     {
+      "label": "箱型",
+      "prop": "boxPile",
+      "index": 3,
+      "overHidden": true,
+      "cell": true
+    },
+    {
       "label": "运费",
       "prop": "oceanFreight",
-      "index": 3,
+      "index": 4,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 4,
+      "index": 5,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 5,
+      "index": 6,
       "overHidden": true,
       "cell": true
     }

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -11,21 +11,22 @@
           >返回列表
         </el-button>
       </div>
-      <el-button
-        class="fix-customer-btn"
-        type="primary"
-        :disabled="disabled && detailData.status == 1"
-        @click="editCustomer('submit')"
-        v-if="form.id"
-        >确认修改
-      </el-button>
-      <el-button
-        class="add-customer-btn"
-        type="primary"
-        :disabled="disabled && detailData.status == 1"
-        @click="editCustomer('fix')"
-        >提 交
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button
+          type="primary"
+          :disabled="disabled && detailData.status == 1"
+          @click="editCustomer('submit')"
+          v-if="form.id&&detailData.status != 1"
+          >确认修改
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled && detailData.status == 1"
+          v-if="detailData.status != 1"
+          @click="editCustomer('fix')"
+          >提 交
+        </el-button>
+      </div>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
@@ -261,7 +262,7 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00",
-            row:true
+            row: true
           },
           {
             label: "箱型",