进口贸易 接口 页面

src/api/importTrade/purchase.js

@@ -4,12 +4,20 @@ import request from '@/router/axios';
 //列表查询
 export function selectPurchaseList(data) {
   return request({
-    url: '/api/trade-purchase/import-order/page',
+    url: '/api/trade-purchase/import-order/list',
     method: 'get',
     params: data
   })
 }
 
+export function getItemByPid(id) {
+  return request({
+    url: '/api/trade-purchase/import-order/getItemByPid',
+    method: 'get',
+    params: {id}
+  })
+}
+
 // 提交
 export function submitData(data) {
   return request({
@@ -37,10 +45,10 @@ export function detailListData(id) {
 }
 
 // 删除主页
-export function removeData(data) {
+export function removeData(ids) {
   return request({
     url: '/api/trade-purchase/import-order/remove',
-    method: 'delete',
-    data: data
+    method: 'post',
+    params: {ids}
   })
 }

src/api/workManagement/serviceProject.js

@@ -13,12 +13,12 @@ export const getServiceProjectList = (current, size, params, goodsTypeId) => {
   })
 }
 
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-client/affairsdesc/update',
+    url: '/api/blade-client/affairsdesc/remove',
     method: 'post',
-    data: {
-      id:id
+    params: {
+      ids
     }
   })
 }

src/views/basicData/commodityType/configuration/customerContact.json

@@ -26,21 +26,8 @@
       "value": 0
     },
     {
-      "label": "数量",
-      "prop": "code",
-      "index": 1,
-      "width":200,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": " ",
-          "trigger": "blur"
-        }
-      ]
-    },{
       "label": "计价单位",
-      "prop": "bigCharacter",
+      "prop": "unit",
       "index": 1,
       "width":200,
       "cell": true,
@@ -53,7 +40,7 @@
       ]
     },{
       "label": "币别",
-      "prop": "brand",
+      "prop": "currency",
       "index": 2,
       "width":200,
       "cell": true,
@@ -66,7 +53,7 @@
       ]
     },{
       "label": "单价",
-      "prop": "brandItem",
+      "prop": "price",
       "index": 3,
       "width":200,
       "cell": true,
@@ -79,9 +66,9 @@
       ]
     },{
       "label": "备注",
-      "prop": "typeno",
+      "prop": "remarks",
       "index": 4,
-      "width":530,
+      "width":700,
       "cell": true,
       "rules": [
         {

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -487,8 +487,12 @@ export default {
     if (this.$route.query.id) {
       getDetail(JSON.parse(this.$route.query.id)).then(res => {
         this.form = res.data.data
-        this.contactsData = res.data.data.saleGoodsPrice
-        this.purchaseData = res.data.data.buyGoodsPrice
+        if(res.data.data.saleGoodsPrice){
+          this.contactsData = res.data.data.saleGoodsPrice
+        }
+        if(res.data.data.buyGoodsPrice){
+          this.purchaseData = res.data.data.buyGoodsPrice
+        }
       })
     }else{
       //新增时根据左侧选中树结构给客户类别赋值
@@ -562,7 +566,7 @@ export default {
         let valids = true;
         if(this.contactsData.length !=0){
           this.contactsData.forEach((item) =>{
-            if((!item.code ||!item.bigCharacter ||!item.brand ||!item.brandItem ) && valids){
+            if((!item.price ||!item.currency ||!item.unit ) && valids){
               this.$message({
                 type: "warning",
                 message: "请检查销售价格第 "+(item.$index +1 )+" 行必填项"

src/views/importTrade/invoice/config/mainList.json

@@ -3,7 +3,8 @@
     "tip": false,
     "simplePage": true,
     "searchShow": true,
-    "searchMenuSpan": 6,
+    "searchMenuSpan": 24,
+  "searchMenuPosition": "right",
     "dialogWidth": "60%",
     "tree": true,
     "border": true,
@@ -12,65 +13,65 @@
     "viewBtn": false,
     "editBtn": false,
     "delBtn": false,
-    "menuWidth": 300,
+    "menuWidth": 220,
     "dialogClickModal": false,
-    "searchLabelWidth": 100,
+    "searchLabelWidth": 120,
     "column":[
         {
             "label": "系统号",
             "prop": "sysNo",
             "search": true,
             "index": 1,
-            "width":100
+            "width":150
         },
         {
             "label": "合同号",
             "prop": "orderNo",
             "search": true,
             "index": 2,
-            "width":100
+            "width":150
         },{
             "label": "发货日期",
             "prop": "businessDate",
             "search": true,
             "index": 3,
-            "width":100
+            "width":150
         },{
         "label": "业务员",
         "prop": "saleman",
         "search": true,
         "index": 4,
-        "width":100
+        "width":120
       },{
         "label": "销售公司",
         "prop": "salesCompany",
         "search": true,
         "index": 5,
-        "width":100
+        "width":150
       },{
         "label": "工厂/贸易商名称",
         "prop": "corpId",
         "search": true,
         "index": 6,
-        "width":100
+        "width":150
       },{
         "label": "仓库名称",
         "prop": "storageId",
         "search": true,
         "index": 7,
-        "width":100
+        "width":150
       },{
         "label": "发票重量",
         "prop": "invoiceWeight",
         "search": true,
         "index": 9,
-        "width":100
+        "width":120
       },{
         "label": "备注",
         "prop": "deliveryRemarks",
         "search": false,
         "index": 10,
-        "width":100
+        "width":120
       }
     ]
 }

src/views/importTrade/receipt/config/customerContact.json

@@ -11,18 +11,20 @@
   "refreshBtn": false,
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
+  "align": "center",
+  "delBtn":true,
   "tree": true,
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 220,
   "dialogClickModal": false,
   "column":[
     {
       "label": "提单号",
       "prop": "billNo",
       "index": 1,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -35,7 +37,7 @@
       "label": "合同号",
       "prop": "contractNumber",
       "index": 1,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -48,7 +50,7 @@
       "label": "货物品种",
       "prop": "priceCategory",
       "index": 2,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -61,7 +63,7 @@
       "label": "货物详情",
       "prop": "cname",
       "index": 3,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -74,7 +76,7 @@
       "label": "件数",
       "prop": "actualQuantity",
       "index": 4,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -87,7 +89,7 @@
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
       "index": 5,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -100,7 +102,7 @@
       "label": "码单重量(吨)",
       "prop": "billWeight",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -113,7 +115,7 @@
       "label": "单价",
       "prop": "price",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -126,7 +128,7 @@
       "label": "合同金额",
       "prop": "contractAmount",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -139,7 +141,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 6,
-      "width":110,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -152,7 +154,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 7,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {

src/views/importTrade/receipt/config/mainList.json

@@ -1,76 +1,78 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
-    "searchMenuSpan": 6,
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "searchMenuPosition": "right",
+  "align": "center",
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 220,
+  "dialogClickModal": false,
+  "searchLabelWidth": 120,
   "column":[
     {
       "label": "系统号",
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "width":100
+      "width":150
     },
     {
       "label": "合同号",
       "prop": "orderNo",
       "search": true,
       "index": 2,
-      "width":100
+      "width":120
     },{
       "label": "收货日期",
       "prop": "businessDate",
       "search": true,
       "index": 3,
-      "width":100
+      "width":150
     },{
       "label": "业务员",
       "prop": "saleman",
       "search": true,
       "index": 4,
-      "width":100
+      "width":120
     },{
       "label": "销售公司",
       "prop": "salesCompany",
       "search": true,
       "index": 5,
-      "width":100
+      "width":150
     },{
       "label": "工厂/贸易商名称",
       "prop": "corpId",
       "search": true,
       "index": 6,
-      "width":100
+      "width":150
     },{
       "label": "仓库名称",
       "prop": "storageId",
       "search": true,
       "index": 7,
-      "width":100
+      "width":150
     },{
       "label": "发票重量",
       "prop": "invoiceWeight",
       "search": true,
       "index": 9,
-      "width":100
+      "width":120
     },{
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": false,
       "index": 10,
-      "width":100
+      "width":180
     }
   ]
 }

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -2,7 +2,6 @@
   <div class="borderless">
     <div class="customer-head">
       <div class="customer-back">
-        <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
@@ -22,8 +21,7 @@
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'" leaf-only multiple :props="{label:'title'}"v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"/>-->
-                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder=" " value-format="yyyy-MM-dd HH:mm:ss"/>
                 <el-select v-else-if="item.type === 'select'" style="width: 100%" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option
                     v-for="(data, index) in item.dicData"
@@ -32,6 +30,7 @@
                     :value="data.value"
                   ></el-option>
                 </el-select>
+                <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder=" "></el-input>
                 <el-input v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -66,7 +65,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
-              >新增
+              >录入明细
               </el-button>
             </template>
           </avue-crud>
@@ -158,10 +157,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '收货日期',
-            prop: 'businessDate',
-            type:'datetime',
+          },  {
+            label: '业务员',
+            prop: 'saleman',
+            dicData: [],
             rules: [
               {
                 required: false,
@@ -170,8 +169,8 @@ export default {
               }
             ]
           }, {
-            label: '业务员',
-            prop: 'saleman',
+            label: '销售公司',
+            prop: 'salesCompany',
             // type:'select',
             dicData: [],
             rules: [
@@ -182,8 +181,7 @@ export default {
               }
             ]
           }, {
-            label: '销售公司',
-            prop: 'salesCompany',
+            label: '工厂/贸易商名称',
             // type:'select',
             dicData: [],
             rules: [
@@ -194,10 +192,9 @@ export default {
               }
             ]
           }, {
-            label: '工厂/贸易商名称',
-            prop: 'corpId',
-            // type:'select',
-            dicData: [],
+            label: '收货日期',
+            prop: 'businessDate',
+            type:'datetime',
             rules: [
               {
                 required: false,
@@ -205,7 +202,7 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },{
             label: '仓库名称',
             prop: 'storageId',
             // type:'select',

src/views/purchase/contract/config/advantageProject.json

@@ -15,32 +15,34 @@
   "index": true,
   "refreshBtn": false,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 180,
+  "align": "center",
   "dialogClickModal": false,
   "column":[
     {
-      "label": "费用名称",
-      "prop": "feeName",
+      "label": "编号",
+      "prop": "code",
       "index": 1,
-      "width":100,
+      "width":200,
       "cell": false,
       "rules": [
         {
           "required": true,
-          "message": "请输入费用名称",
+          "message": "请输入编号",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "编号",
-      "prop": "code",
+    },
+    {
+      "label": "费用名称",
+      "prop": "feeName",
       "index": 2,
-      "width":100,
+      "width":200,
       "cell": false,
       "rules": [
         {
           "required": true,
-          "message": "请输入编号",
+          "message": "请输入费用名称",
           "trigger": "blur"
         }
       ]
@@ -48,7 +50,7 @@
       "label": "国内支付方",
       "prop": "corpId",
       "index": 3,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -61,7 +63,7 @@
       "label": "支付金额",
       "prop": "amount",
       "index": 4,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -74,7 +76,7 @@
       "label": "核销金额",
       "prop": "settlmentAmount",
       "index": 5,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -88,7 +90,7 @@
       "prop": "sort",
       "type": "number",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -101,7 +103,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 7,
-      "width":100,
+      "width":330,
       "cell": true,
       "rules": [
         {

src/views/purchase/contract/config/customerContact.json

@@ -10,19 +10,21 @@
   "cancelBtn":false,
   "refreshBtn": false,
   "searchMenuSpan": 6,
+  "align": "center",
+  "delBtn":true,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 180,
   "dialogClickModal": false,
   "column":[
     {
       "label": "提单号",
       "prop": "billNO",
       "index": 1,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -35,7 +37,7 @@
       "label": "货物品种",
       "prop": "priceCategory",
       "index": 2,
-      "width":100,
+      "width":120,
       "cell": false,
       "rules": [
         {
@@ -48,7 +50,7 @@
       "label": "货物详情",
       "prop": "cname",
       "index": 3,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -74,7 +76,7 @@
       "label": "件数",
       "prop": "purchaseQuantity",
       "index": 5,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -87,7 +89,7 @@
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -100,7 +102,7 @@
       "label": "码单重量(吨)",
       "prop": "billWeight",
       "index": 7,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -113,7 +115,7 @@
       "label": "单价",
       "prop": "price",
       "index": 8,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -126,7 +128,7 @@
       "label": "合同金额",
       "prop": "amount",
       "index": 9,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -139,7 +141,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 10,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -152,7 +154,7 @@
       "label": "币别",
       "prop": "currency",
       "index": 11,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -165,7 +167,7 @@
       "label": "汇率",
       "prop": "exchangeRate",
       "index": 12,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -178,7 +180,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 13,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {

src/views/purchase/contract/config/mainList.json

@@ -1,111 +1,122 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
-    "searchMenuSpan": 6,
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "addBtnText": "新单",
-    "expand": true,
-    "rowKey": "id",
-    "column":[
-      {
-        "label": "合同号",
-        "prop": "orderNo",
-        "search": true,
-        "index": 2,
-        "width":100
-      },
-        {
-            "label": "合同日期",
-            "prop": "businesDate",
-            "search": true,
-            "index": 1,
-            "width":100
-        },
-        {
-            "label": "供应商",
-            "prop": "corpId",
-            "search": true,
-            "index": 3,
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 12,
+  "dialogWidth": "60%",
+  "align": "center",
+  "searchMenuPosition": "right",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 220,
+  "dialogClickModal": false,
+  "searchLabelWidth": 140,
+  "addBtnText": "新单",
+  "expand": true,
+  "rowKey": "id",
+  "column":[
+    {
+      "label": "合同号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 1,
+      "width":100
+    },
+    {
+      "label": "合同日期",
+      "prop": "businesDate",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "index": 2,
+      "width":150
+    },
+    {
+      "label": "供应商",
+      "prop": "corpId",
+      "search": true,
+      "index": 3,
 
-            "width":100
-        },{
-            "label": "采购商",
-            "prop": "purchaserId",
-            "search": true,
-            "index": 4,
-            "width":100
-        },{
-            "label": "付款日期/开证日期",
-            "prop": "accountsCollectionDate",
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "search": true,
-            "index": 5,
-            "width":100
-        },{
-            "label": "到港日期",
-            "prop": "dateOfArrival",
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "search": true,
-            "index": 6,
-            "width":100
-        },{
-            "label": "合同金额",
-            "prop": "orderAmount",
-            "search": false,
-            "index": 7,
-            "width":100
-        },{
-            "label": "币别",
-            "prop": "currency",
-            "search": false,
-            "index": 8,
-            "width":100
-        },{
-          "label": "汇率",
-          "prop": "exChangeRate",
-          "search": false,
-          "index": 8,
-          "width":100
-        },{
-            "label": "是否全部到货",
-            "prop": "arrival",
-            "search": false,
-            "index": 8,
-            "width":100
-        },{
-            "label": "单据状态",
-            "prop": "status",
-            "search": false,
-            "index": 8,
-            "width":100
-        },{
-            "label": "单据类型",
-            "prop": "orderType",
-            "search": false,
-            "index": 8,
-            "width":100
-        },{
-            "label": "备注",
-            "prop": "orderRemark",
-            "search": false,
-            "index": 8,
-            "width":100
-        }
-    ]
+      "width":100
+    },{
+      "label": "采购商",
+      "prop": "purchaserId",
+      "search": true,
+      "index": 4,
+      "width":100
+    },{
+      "label": "付款日期/开证日期",
+      "prop": "accountsCollectionDate",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "index": 5,
+      "width":150
+    },{
+      "label": "到港日期",
+      "prop": "dateOfArrival",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "index": 6,
+      "width":150
+    },{
+      "label": "合同金额",
+      "prop": "orderAmount",
+      "search": false,
+      "index": 7,
+      "width":100
+    },{
+      "label": "币别",
+      "prop": "currency",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "汇率",
+      "prop": "exChangeRate",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "是否全部到货",
+      "prop": "arrival",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "单据状态",
+      "prop": "status",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "单据类型",
+      "prop": "orderType",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "备注",
+      "prop": "orderRemark",
+      "search": false,
+      "index": 8,
+      "width":100
+    }
+  ]
 }

src/views/purchase/contract/config/uploadList.json

@@ -10,32 +10,33 @@
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 180,
+  "align": "center",
   "dialogClickModal": false,
   "addBtnText": "上  传",
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
+      "label": "文件名称",
+      "prop": "fileName",
       "index": 1,
-      "width":100,
+      "width":350,
       "rules": [
         {
           "required": true,
-          "message": "请输入排序",
+          "message": "请输入文件名称",
           "trigger": "blur"
         }
       ]
     },{
-      "label": "文件名称",
-      "prop": "fileName",
+      "label": "排序",
+      "prop": "sort",
+      "type": "number",
       "index": 2,
-      "width":100,
+      "width":150,
       "rules": [
         {
           "required": true,
-          "message": "请输入文件名称",
+          "message": "请输入排序",
           "trigger": "blur"
         }
       ]
@@ -43,7 +44,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 5,
-      "width":100,
+      "width":800,
       "rules": [
         {
           "required": false,

src/views/purchase/contract/detailsPage.vue

@@ -30,7 +30,9 @@
                     :value="data.value"
                   ></el-option>
                 </el-select>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <selectComponent v-else-if="item.type === 'component'" v-model="form[item.prop]" :configuration="configuration"/>
+                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -48,16 +50,12 @@
             @row-update="rowUpdate"
             @row-del="rowDel"
           >
-            <template slot="code" slot-scope="{row,index}">
-              <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)">选择</el-button>
-            </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
                 size="small"
                 @click="rowCell(row,index)"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
+              >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
@@ -65,11 +63,12 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
-              >新增
+              >录入明细
               </el-button>
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
+                         @click=""
               >申请付款(开证)
               </el-button>
             </template>
@@ -88,7 +87,9 @@
             @row-del="rowDelAdvantageProject"
           >
             <template slot="code" slot-scope="{row,index}">
-              <span style="float: left;padding-top: 2px">{{row.code}}</span><el-button type="text" size="mini" style="float: right" @click="choice(row)">选择</el-button>
+              <span v-if="row.$cellEdit" style="float: left;color: #F56C6C;">*</span>
+              <span style="margin-left: 12px;padding-top: 2px">{{ row.code }}</span>
+              <el-button type="text" size="mini" style="float: right" @click="choice(row)">选择</el-button>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
@@ -102,7 +103,8 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
-              >新增</el-button>
+              >录入明细
+              </el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -122,7 +124,7 @@
     </div>
 
     <el-dialog
-      title="导入商品"
+      title="导入商品详情"
       append-to-body
       class="el-dialogDeep"
       :visible.sync="dialogVisible"
@@ -211,17 +213,9 @@ import optionTwoCost from "./config/mainListCost.json"
 import {detailListData,
   submitData,} from "@/api/importTrade/purchase";
 import commodity from "./config/commodity.json"
-import {
-  typeSave, detail, deleteDetails,
-  corpstypeTree,
-  corpsattn,
-  corpsbank,
-  corpsfiles,
-  corpsitem,
-  getList,
-  getDeptLazyTreeS
-} from "@/api/basicData/configuration"
-
+//商品详情接口
+import {corpsattn, corpsbank,  getDeptLazyTreeS} from "@/api/basicData/configuration"
+import { getList } from "@/api/basicData/commodityType"
 export default {
   name: "detailsPage",
   data() {
@@ -268,6 +262,15 @@ export default {
           children: 'children'
         }
       },
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:false,
+        collapseTags:false,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       // 合同上传数据
       uploadList: uploadList,
       // 合同数据
@@ -321,6 +324,7 @@ export default {
           {
             label: '系统编号',
             prop: 'sysNo',
+            disabled:true,
             rules: [
               {
                 required: false,
@@ -329,20 +333,22 @@ export default {
               }
             ]
           }, {
-            label: '到港日期',
-            prop: 'dateOfArrival',
-            type:'datetime',
+            label: '供应商',
+            prop: 'corpId',
+            type:'component',
+            dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '要求发货日期',
-            prop: 'requiredDeliveryDate',
-            type:'datetime',
+          }, {
+            label: '采购商',
+            prop: 'purchaserId',
+            type:'component',
+            dicData: [],
             rules: [
               {
                 required: true,
@@ -350,22 +356,20 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '要求到货日期',
-            prop: 'requiredArrivalDate',
-            type:'datetime',
+          },{
+            label: '合同号',
+            prop: 'orderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '供应商',
-            prop: 'corpId',
-            // type:'select',
-            dicData: [],
+            label: '合同日期',
+            prop: 'businesDate',
+            type:'datetime',
             rules: [
               {
                 required: false,
@@ -374,8 +378,8 @@ export default {
               }
             ]
           }, {
-            label: '业务员',
-            prop: 'salesName',
+            label: '合同类型',
+            prop: 'orderType',
             // type:'select',
             dicData: [],
             rules: [
@@ -386,8 +390,8 @@ export default {
               }
             ]
           }, {
-            label: '合同号',
-            prop: 'orderNo',
+            label: '合同金额',
+            prop: 'orderAmount',
             rules: [
               {
                 required: false,
@@ -396,9 +400,8 @@ export default {
               }
             ]
           }, {
-            label: '合同日期',
-            prop: 'businesDate',
-            type:'datetime',
+            label: '合同重量',
+            prop: 'contractWeight',
             rules: [
               {
                 required: false,
@@ -407,8 +410,8 @@ export default {
               }
             ]
           }, {
-            label: '合同类型',
-            prop: 'orderType',
+            label: '业务员',
+            prop: 'salesName',
             // type:'select',
             dicData: [],
             rules: [
@@ -418,33 +421,31 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '采购商',
-            prop: 'purchaserId',
-            // type:'select',
-            dicData: [],
+          },{
+            label: '要求发货日期',
+            prop: 'requiredDeliveryDate',
+            type:'datetime',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '付款方式',
-            prop: 'paymentType',
-            // type:'select',
-            dicData: [],
+            label: '要求到货日期',
+            prop: 'requiredArrivalDate',
+            type:'datetime',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '付款/开证日期',
-            prop: 'accountsCollectionDate',
+          },{
+            label: '到港日期',
+            prop: 'dateOfArrival',
             type:'datetime',
             rules: [
               {
@@ -454,9 +455,8 @@ export default {
               }
             ]
           }, {
-            label: '信用证到期日',
-            prop: 'creditDate',
-            type:'datetime',
+            label: '单价',
+            prop: 'salesPrice',
             rules: [
               {
                 required: false,
@@ -465,8 +465,8 @@ export default {
               }
             ]
           }, {
-            label: '合同金额',
-            prop: 'orderAmount',
+            label: '币别',
+            prop: 'currency',
             rules: [
               {
                 required: false,
@@ -475,8 +475,8 @@ export default {
               }
             ]
           }, {
-            label: '人民币金额',
-            prop: 'rmbAmount',
+            label: '汇率',
+            prop: 'exchangeRate',
             rules: [
               {
                 required: false,
@@ -485,8 +485,8 @@ export default {
               }
             ]
           }, {
-            label: '预付(保证)金额',
-            prop: 'advancePayment',
+            label: '人民币金额',
+            prop: 'rmbAmount',
             rules: [
               {
                 required: false,
@@ -495,8 +495,10 @@ export default {
               }
             ]
           }, {
-            label: '单价',
-            prop: 'salesPrice',
+            label: '付款方式',
+            prop: 'paymentType',
+            // type:'select',
+            dicData: [],
             rules: [
               {
                 required: false,
@@ -505,8 +507,9 @@ export default {
               }
             ]
           }, {
-            label: '币别',
-            prop: 'currency',
+            label: '付款/开证日期',
+            prop: 'accountsCollectionDate',
+            type:'datetime',
             rules: [
               {
                 required: false,
@@ -515,8 +518,8 @@ export default {
               }
             ]
           }, {
-            label: '汇率',
-            prop: 'exchangeRate',
+            label: '预付(保证)金额',
+            prop: 'advancePayment',
             rules: [
               {
                 required: false,
@@ -524,9 +527,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '合同重量',
-            prop: 'contractWeight',
+          },{
+            label: '已付金额',
+            prop: 'settlmentAmount',
             rules: [
               {
                 required: false,
@@ -535,8 +538,9 @@ export default {
               }
             ]
           }, {
-            label: '码单重量',
-            prop: 'billWeight',
+            label: '信用证到期日',
+            prop: 'creditDate',
+            type:'datetime',
             rules: [
               {
                 required: false,
@@ -544,9 +548,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '已付金额',
-            prop: 'settlmentAmount',
+          },   {
+            label: '码单重量',
+            prop: 'billWeight',
             rules: [
               {
                 required: false,
@@ -554,7 +558,7 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },  {
             label: "订单备注",
             span: 24,
             prop: "orderRemark",
@@ -666,10 +670,10 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    //商品详情list
     onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-        console.log(res)
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -678,10 +682,8 @@ export default {
     },
     //确认导入触发
     importGoods() {
-      // this.contactsData = this.contactsData.concat(this.tableData)
       if (this.tableData.length > 0) {
         for (let item in this.tableData) {
-          console.log(this.tableData[item])
           this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
           this.tableData[item].itemId = this.tableData[item].id
           delete this.tableData[item].id

src/views/purchase/contract/index.vue

@@ -18,26 +18,19 @@
                @refresh-change="refreshChange"
                @on-load="onLoad"
                @expand-change="expandChange">
-      <template slot-scope="{row,size}" slot="search">
-        <el-col :span="6">
-          <el-form-item label="提单号" label-width="100px">
-            <el-input placeholder="请输入 提单号" :size="size" style="width: 200px" v-model="search.fmBlno"></el-input>
-          </el-form-item>
-        </el-col>
-      </template>
       <template slot-scope="scope" slot="expand">
-        <el-table
-          :data="scope.row.insideList"
-          v-loading="scope.row.loading"
-        >
-          <el-table-column  label="提单号" prop="fMblno" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="货物品种" prop="goodsVariety" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="件数" prop="number" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="毛重(KG)" prop="grossWeight" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="净重(KG)" prop="netWeight" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="合同金额" prop="amount" align="center" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column  label="是否到货" prop="isArrival" align="center" show-overflow-tooltip width="100"></el-table-column>
+        <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
+          <el-table-column   align="center"  width="60"></el-table-column>
+          <el-table-column   type="selection" align="center"  width="50"></el-table-column>
+          <el-table-column  label="序号" type="index" align="center"  width="50"></el-table-column>
+          <el-table-column  label="提单号" prop="billNO" align="center" show-overflow-tooltip width="200"></el-table-column>
+          <el-table-column  label="货物品种" prop="priceCategory" align="center" show-overflow-tooltip width="180"></el-table-column>
+          <el-table-column  label="件数" prop="purchaseQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="毛重(KG)" prop="grossWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="净重(KG)" prop="netWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="合同金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
+          <el-table-column  label="是否到货" prop="isArrival" align="center" show-overflow-tooltip width="200"></el-table-column>
         </el-table>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -69,7 +62,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import {selectPurchaseList,detailListData} from "@/api/importTrade/purchase";
+import {selectPurchaseList,removeData,getItemByPid} from "@/api/importTrade/purchase";
 
 export default {
   name: "index",
@@ -94,16 +87,16 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        // return deleteDetails(row.id);
-        return this.dataList.splice(index, 1)
-      }).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId: 0});
-      });
+        removeData(row.id).then(res =>{
+          if(res.data.success){
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.onLoad(this.page );
+          }
+        })
+      })
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
@@ -193,6 +186,23 @@ export default {
       console.log('1')
     },
     onLoad(page, params) {
+      if(params){
+        if (params.businesDate != undefined) {
+          params.businesStartDate = params.businesDate[0];
+          params.businesEndDate = params.businesDate[1];
+          this.$delete(params,'businesDate')
+        }
+        if (params.accountsCollectionDate!= undefined) {
+          params.accountsCollectionStartDate = params.accountsCollectionDate[0];
+          params.accountsCollectionEndDate = params.accountsCollectionDate[1];
+          this.$delete(params,'accountsCollectionDate')
+        }
+        if (params.dateOfArrival!= undefined) {
+          params.dateOfStartArrival = params.dateOfArrival[0];
+          params.dateOfEndArrival = params.dateOfArrival[1];
+          this.$delete(params,'dateOfArrival')
+        }
+      }
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
         current: page.currentPage,
@@ -208,15 +218,21 @@ export default {
     },
     //表格展开触发
     expandChange(row, expendList) {
-      this.dataList[0].insideList = [
-        {fMblno: '101801',goodsVariety:'巴西棉',number:100,grossWeight:7.7,netWeight:7.1,price: 10,amount:1000,isArrival:'是'}
-      ];
-      setTimeout((() => {this.dataList[0].loading = false}), 1000)
+      if(row.hasItem){
+        getItemByPid(row.id).then(res =>{
+          this.dataList[0].insideList = res.data.data;
+          row.loading = false
+        })
+      }else{
+        return
+      }
     },
   },
 }
 </script>
 
 <style scoped>
-
+::v-deep .el-table__expanded-cell{
+  padding: 0 !important;
+}
 </style>

src/views/salesManagement/salesContract/config/advantageProject.json

@@ -5,6 +5,7 @@
   "searchShow": true,
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
+  "align": "center",
   "addBtn":false,
   "editBtn":false,
   "addRowBtn":false,
@@ -15,32 +16,33 @@
   "index": true,
   "refreshBtn": false,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 180,
   "dialogClickModal": false,
   "column":[
     {
-      "label": "费用名称",
-      "prop": "feeName",
+      "label": "编号",
+      "prop": "code",
       "index": 1,
-      "width":100,
+      "width":150,
       "cell": false,
       "rules": [
         {
           "required": true,
-          "message": "请输入费用名称",
+          "message": "请输入编号",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "编号",
-      "prop": "code",
+    },
+    {
+      "label": "费用名称",
+      "prop": "feeName",
       "index": 2,
-      "width":100,
+      "width":150,
       "cell": false,
       "rules": [
         {
           "required": true,
-          "message": "请输入编号",
+          "message": "请输入费用名称",
           "trigger": "blur"
         }
       ]
@@ -48,7 +50,7 @@
       "label": "国内支付方",
       "prop": "corpId",
       "index": 3,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -61,7 +63,7 @@
       "label": "支付金额",
       "prop": "amount",
       "index": 4,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -74,7 +76,7 @@
       "label": "核销金额",
       "prop": "settlmentAmount",
       "index": 5,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -88,7 +90,7 @@
       "prop": "sort",
       "type": "number",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -101,7 +103,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 7,
-      "width":100,
+      "width":520,
       "cell": true,
       "rules": [
         {

src/views/salesManagement/salesContract/config/importInventory.json

@@ -5,6 +5,7 @@
   "searchShow": true,
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
+  "align": "center",
   "addBtn":false,
   "editBtn":false,
   "addRowBtn":false,
@@ -15,14 +16,14 @@
   "index": true,
   "refreshBtn": false,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 220,
   "dialogClickModal": false,
   "column":[
     {
       "label": "提单号",
       "prop": "billNo",
       "index": 1,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -35,7 +36,7 @@
       "label": "合同号",
       "prop": "orgOrderNo",
       "index": 2,
-      "width":100,
+      "width":150,
       "cell": true,
       "rules": [
         {
@@ -48,7 +49,7 @@
       "label": "货物品种",
       "prop": "priceCategory",
       "index": 3,
-      "width":100,
+      "width":120,
       "cell": false,
       "rules": [
         {
@@ -61,7 +62,7 @@
       "label": "货物详情",
       "prop": "cname",
       "index": 4,
-      "width":100,
+      "width":120,
       "cell": false,
       "rules": [
         {
@@ -74,7 +75,7 @@
       "label": "件数",
       "prop": "actualQuantity",
       "index": 5,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -87,7 +88,7 @@
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
       "index": 6,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -100,7 +101,7 @@
       "label": "码单重量(吨)",
       "prop": "billWeight",
       "index": 7,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -113,7 +114,7 @@
       "label": "单价",
       "prop": "price",
       "index": 8,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -126,7 +127,7 @@
       "label": "合同金额",
       "prop": "amount",
       "index": 9,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -139,7 +140,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 10,
-      "width":100,
+      "width":120,
       "cell": true,
       "rules": [
         {
@@ -152,7 +153,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 11,
-      "width":100,
+      "width":200,
       "cell": true,
       "rules": [
         {

src/views/salesManagement/salesContract/config/mainList.json

@@ -3,7 +3,8 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 18,
+  "searchMenuPosition": "right",
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -12,9 +13,10 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 300,
+  "menuWidth": 220,
+  "align": "center",
   "dialogClickModal": false,
-  "searchLabelWidth": 100,
+  "searchLabelWidth": 120,
   "addBtnText": "新单",
   "expand": true,
   "rowKey": "id",
@@ -24,32 +26,32 @@
       "prop": "businessDate",
       "search": true,
       "index": 1,
-      "width":100
+      "width":150
     },
     {
       "label": "合同号",
       "prop": "orderNo",
       "search": true,
       "index": 2,
-      "width":100
+      "width":150
     },{
       "label": "销售公司",
       "prop": "belongToCorpId",
       "search": true,
       "index": 3,
-      "width":100
+      "width":120
     },{
       "label": "工厂/贸易商名称",
       "prop": "corpId",
       "search": true,
       "index": 4,
-      "width":100
+      "width":150
     },{
       "label": "合同金额",
       "prop": "orderAmount",
       "search": false,
       "index": 5,
-      "width":100
+      "width":120
     },{
       "label": "币别",
       "prop": "currency",
@@ -73,13 +75,13 @@
       "prop": "salesName",
       "search": true,
       "index": 8,
-      "width":100
+      "width":120
     },{
       "label": "单据状态",
       "prop": "status",
       "search": false,
       "index": 8,
-      "width":100
+      "width":120
     },{
       "label": "备注",
       "prop": "orderRemark",

src/views/salesManagement/salesContract/config/uploadList.json

@@ -5,37 +5,39 @@
   "searchShow": true,
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
+  "align": "center",
   "tree": true,
   "refreshBtn": false,
   "border": true,
   "index": true,
   "selection": true,
-  "menuWidth": 300,
+  "menuWidth": 180,
   "dialogClickModal": false,
   "addBtnText": "上  传",
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
+      "label": "文件名称",
+      "prop": "fileName",
       "index": 1,
-      "width":100,
+      "width":300,
       "rules": [
         {
           "required": true,
-          "message": "请输入排序",
+          "message": "请输入文件名称",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "文件名称",
-      "prop": "fileName",
+    },
+    {
+      "label": "排序",
+      "prop": "sort",
+      "type": "number",
       "index": 2,
-      "width":100,
+      "width":150,
       "rules": [
         {
           "required": true,
-          "message": "请输入文件名称",
+          "message": "请输入排序",
           "trigger": "blur"
         }
       ]
@@ -43,7 +45,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 5,
-      "width":100,
+      "width":830,
       "rules": [
         {
           "required": false,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -30,6 +30,7 @@
                     :value="data.value"
                   ></el-option>
                 </el-select>
+                <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -53,23 +54,14 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="newDetails"
-              >新增明细</el-button>
-              <el-button type="warning"
-                         icon="el-icon-download"
-                         size="small"
-              >导 出</el-button>
-              <el-button type="info"
-                         icon="el-icon-printer"
-                         size="small"
-              >打 印</el-button>
-              <el-button type="warning"
-                         icon="el-icon-plus"
+              >录入明细</el-button>
+              <el-button type="primary"
                          size="small"
                          :disabled="selection.length < 1"
-                         @click="generateShipmentD">生成发货单
+                         @click="generateShipmentD"
+              >生成发货单
               </el-button>
-              <el-button type="primary"
-                         icon="el-icon-plus"
+              <el-button type="info"
                          size="small"
               >收款记录
               </el-button>
@@ -117,7 +109,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
-              >新增</el-button>
+              >录入明细</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -165,7 +157,9 @@
                        @refresh-change="refreshChange"
                        @selection-change="selectionChange"
                        :page.sync="page"
-                       @on-load="onLoad"></avue-crud>
+                       @on-load="onLoad">
+
+            </avue-crud>
           </basic-container>
         </el-col>
       </el-row>
@@ -322,9 +316,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '提成标准',
-            prop: 'commissionRate',
+          },  {
+            label: '发票号（PI）',
+            prop: 'proformInvoice',
             rules: [
               {
                 required: false,
@@ -333,8 +327,8 @@ export default {
               }
             ]
           }, {
-            label: '发票号（PI）',
-            prop: 'proformInvoice',
+            label: '合同金额',
+            prop: 'orderAmount',
             rules: [
               {
                 required: false,
@@ -343,8 +337,8 @@ export default {
               }
             ]
           }, {
-            label: '起运港',
-            prop: 'portOfLoad',
+            label: '收款金额',
+            prop: 'settlmentAmount',
             rules: [
               {
                 required: false,
@@ -352,10 +346,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },
-          {
-            label: '目的港',
-            prop: 'portOfDestination',
+          }, {
+            label: '起运港',
+            prop: 'portOfLoad',
             rules: [
               {
                 required: false,
@@ -365,8 +358,8 @@ export default {
             ]
           },
           {
-            label: '包装要求',
-            prop: 'packageRemarks',
+            label: '目的港',
+            prop: 'portOfDestination',
             rules: [
               {
                 required: false,
@@ -376,9 +369,8 @@ export default {
             ]
           },
           {
-            label: '计划交期',
-            prop: 'plannedDeliveryDate',
-            type: 'datetime',
+            label: '包装要求',
+            prop: 'packageRemarks',
             rules: [
               {
                 required: false,
@@ -422,9 +414,9 @@ export default {
             ]
           },
           {
-            label: '销售单价',
-            prop: 'salesPrice',
-            data: [],
+            label: '计划交期',
+            prop: 'plannedDeliveryDate',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -432,7 +424,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
             label: '发票重量',
             prop: 'invoiceWeight',
             data: [],
@@ -453,9 +446,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '币别',
-            prop: 'currency',
+          },{
+            label: '销售单价',
+            prop: 'salesPrice',
+            data: [],
             rules: [
               {
                 required: false,
@@ -463,9 +457,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '汇率',
-            prop: 'exchangeRate',
+          },  {
+            label: '币别',
+            prop: 'currency',
             rules: [
               {
                 required: false,
@@ -473,21 +467,9 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },
-          // {
-          //   label: '预收金额',
-          //   prop: 'a14',
-          //   rules: [
-          //     {
-          //       required: true,
-          //       message: ' ',
-          //       trigger: 'blur'
-          //     }
-          //   ]
-          // },
-          {
-            label: '合同金额',
-            prop: 'orderAmount',
+          }, {
+            label: '汇率',
+            prop: 'exchangeRate',
             rules: [
               {
                 required: false,
@@ -495,9 +477,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '收款金额',
-            prop: 'settlmentAmount',
+          },
+          {
+            label: '提成标准',
+            prop: 'commissionRate',
             rules: [
               {
                 required: false,