Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/selectComponent/customerSelect.vue

@@ -148,7 +148,15 @@ export default {
   },
   methods: {
     changeName(){
+      let optionList = this.configuration.dicData.length !== 0?this.dicData.length !== 0?this.dicData:this.configuration.dicData:this.dicData;
+      let valueName ;
+       optionList.map(item =>{
+        if(item.id === this.value){
+          valueName =  item.cname
+        }
+      })
       this.$emit('returnBack', this.value)
+      this.$emit('valueName',valueName)
     },
     //刷新触发
     refreshChange() {
@@ -176,6 +184,7 @@ export default {
       this.$emit('returnBack', this.value)
       this.dialogVisible = false
       this.$emit('receiveList',this.dicData)
+      this.$emit('valueName',this.dicData[0].cname)
     },
     //选中触发
     selectionChange(selection) {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -1256,6 +1256,7 @@ export default {
         itemType:"采购",
         corpsName:this.form.corpsName,
         corpId:this.form.corpId,
+        srcParentId: this.form.id,
       }
       if(type){ //申请货款
         this.billData.srcId = -1

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -230,7 +230,12 @@
                          :disabled="selection.length < 1 || detailData.seeDisabled"
                          @click="getShipmentD">生成发货单
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer" :disabled="detailData.seeDisabled">报 表</el-button>
+              <el-button type="info"
+                         :size="size"
+                         icon="el-icon-printer"
+                         :disabled="detailData.seeDisabled"
+                         @click.stop="openReport()"
+              >报 表</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -493,6 +498,11 @@
       >
       </apply-payment>
     </el-dialog>
+
+    <report-dialog
+      :switchDialog="switchDialog"
+      @onClose="onClose()"
+    ></report-dialog>
   </div>
 </template>
 
@@ -531,6 +541,7 @@ import { getMarketPrice, getPurchasePrice } from "@/api/basicData/fees"
 import customerDialog from "@/components/customer-dialog/main";
 //账单组件
 import ApplyPayment from "../../../components/finance/applyPayment";
+import reportDialog from "@/components/report-dialog/main";
 
 export default {
   name: "detailsPage",
@@ -541,7 +552,8 @@ export default {
   },
   components:{
     customerDialog,
-    ApplyPayment
+    ApplyPayment,
+    reportDialog,
   },
   data() {
     return {
@@ -1094,6 +1106,7 @@ export default {
       rowHeight: '',
       // 查询时loading页面
       pageLoading: false,
+      switchDialog: false,
     }
   },
   mounted() {
@@ -1331,6 +1344,13 @@ export default {
     policy() {
       this.policyDialog = !this.policyDialog
     },
+    // 报表
+    openReport() {
+      this.switchDialog =! this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
+    },
     getShipmentD() {
       if (this.$store.getters.inStatus) {
         this.$alert("发货单存在,请保存发货单再进行操作", "温馨提示", {
@@ -1423,9 +1443,8 @@ export default {
         itemType:"销售",
         corpsName:this.form.corpName,
         corpId:this.form.corpId,
+        srcParentId: this.form.id,
       }
-      console.log(this.form)
-      console.log(this.billData )
       if(type){ //申请货款
         this.billData.srcId = -1
       }

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -11,11 +11,11 @@
                      @click.stop="confirmSettlement"
           >结算
           </el-button>
-         <!-- <el-button class="el-button&#45;&#45;small-yh"
+          <el-button class="el-button--small-yh"
                      type="primary"
                      @click.stop="saveSettlement"
           >{{form.id?"确认修改" :"确认新增"}}
-          </el-button>-->
+          </el-button>
         </div>
       </div>
     </div>

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -7,17 +7,19 @@
         </el-button>
         <div class="upper_right_button">
           <el-button type="warning"
+                     size="small"
                      class="el-button--small-yh"
                      :disabled="financeDisabled"
                      @click.stop="confirmSettlement"
           >结算
           </el-button>
-        <!--  <el-button class="el-button&#45;&#45;small-yh"
+          <el-button class="el-button--small-yh"
                      type="primary"
+                     size="small"
                      :disabled="financeDisabled"
                      @click.stop="saveSettlement"
           >{{form.id?"确认修改" :"确认新增"}}
-          </el-button>-->
+          </el-button>
         </div>
       </div>
     </div>

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

@@ -74,6 +74,13 @@
       ]
     },
     {
+      "label": "箱号",
+      "prop": "cntrNo",
+      "cell": true,
+      "index": 4,
+      "width":120
+    },
+    {
       "label": "库存",
       "prop": "inventoryNumber",
       "index": 4,
@@ -98,7 +105,7 @@
       ]
     },
     {
-      "label": "发票净重(吨)",
+      "label": "发票重量(吨)",
       "prop": "invoiceWeight",
       "index": 7,
       "width":120,
@@ -122,7 +129,7 @@
         }
       ]
     },{
-      "label": "合同金额",
+      "label": "发票金额",
       "prop": "contractAmount",
       "index": 9,
       "width":120,

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 220,
+  "menuWidth": 180,
   "searchIcon": true,
   "searchIndex": 2,
   "dialogClickModal": false,

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -20,7 +20,7 @@
         </el-button>
         <el-button
           class="el-button--small-yh"
-          type="primary"00000
+          type="primary"
           :disabled="disabled || receiptDisable"
           @click="editCustomer"
         >{{ form.id ? '确认修改' : '确认新增' }}
@@ -562,12 +562,13 @@ export default {
     },
     //查询库存
     selectInventory(row){
-      if(row.billNo && row.contractNumber && row.priceCategory && this.form.storageId){
+      if(row.billNo && row.contractNumber && row.cntrNo && row.priceCategory && this.form.storageId){
         const params = {
           billNo:row.billNo,
           contractNumber:row.contractNumber,
-          priceCategory:row.priceCategory,
+          goodsId:row.priceCategory,
           storageId:this.form.storageId,
+          cntrNo:row.cntrNo
         }
         selectGoodsNum(params).then(res =>{
           this.$set(this.contactsData[row.$index],"inventoryNumber",res.data.data)

src/views/importTrade/receipt/index.vue

@@ -45,13 +45,13 @@
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
-        <el-button
+   <!--     <el-button
           type="text"
           icon="el-icon-view"
           size="small"
           @click.stop="beforeOpenPage(scope.row,1)"
         >查看
-        </el-button>
+        </el-button>-->
         <el-button
           type="text"
           icon="el-icon-edit"

src/views/mallManagement/commodity/productList/detailsPageEdit.vue

@@ -186,7 +186,7 @@ export default {
   data() {
     return {
       form: {
-        details:'<h1 class="ql-align-center" style="text-align: center;"><a href="https://avuejs.com/doc/plugins/ueditor-plugins" target="_blank" style="font-weight: bold; color: rgb(194, 79, 74);">欢迎使用Avue富文本编辑器</a></h1><p class="ql-align-center" style="text-align: center;"><span style="font-weight: bold; color: rgb(194, 79, 74);"><img src="https://avuejs.com/images/logo-bg.jpg" height="200" width="200"></span></p>'
+        details:'<p style="text-align: center;"><br></p>'
       },
       page: {
         pageSize: 10,

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

@@ -68,7 +68,7 @@
       "width":150
     },
     {
-      "label": "数量",
+      "label": "件数",
       "prop": "orderQuantity",
       "index": 4,
       "width":120
@@ -91,7 +91,7 @@
       "index": 6,
       "width":120
     },{
-      "label": "发票净重(吨)",
+      "label": "发票重量(吨)",
       "prop": "invoiceWeight",
       "index": 7,
       "width":120,
@@ -108,10 +108,11 @@
       "index": 8,
       "width":120
     },{
-      "label": "合同金额",
+      "label": "发票金额",
       "prop": "amount",
       "index": 9,
       "width":120,
+      "cell": true,
       "rules": [
         {
           "required": false,

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 220,
+  "menuWidth": 180,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/purchase/contract/detailsPage.vue

@@ -90,16 +90,14 @@
             @saveColumn="saveColumn"
           >
             <template slot="priceCategory" slot-scope="{row,index}">
-              <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input
+              <select-component
                 v-if="row.$cellEdit"
                 v-model="row.priceCategoryNames"
-                size="small"
-                placeholder="请点击右侧按钮选择"
-                :disabled="true"
-                style="width: 63%"
-              ></el-input>
-              <el-button v-if="row.$cellEdit" size="small" icon="el-icon-search" @click="choice(row)"></el-button>
+                @valueName="(value) => valueName(value,row)"
+               :configuration="itemConfiguration"
+              >
+                <!-- @valueName="valueName($event,row)"   保留入参情况下，自定义参数-->
+              </select-component>
               <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="itemType" slot-scope="{row,index}">
@@ -397,6 +395,15 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
+      itemConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       // 合同上传数据
       uploadList: uploadList,
       // 合同数据
@@ -487,7 +494,6 @@ export default {
           },{
             label: '合同号',
             prop: 'orderNo',
-            disabled:true,
             rules: [
               {
                 required: false,
@@ -550,18 +556,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '业务员',
-            prop: 'salesName',
-            dicData: [],
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },{
+          },
+          {
             label: '要求发货日期',
             prop: 'requiredDeliveryDate',
             type:'date',
@@ -583,18 +579,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '到港日期',
-            prop: 'dateOfArrival',
-            type:'date',
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
+          },
+          {
             label: '单价',
             prop: 'salesPrice',
             rules: [
@@ -610,7 +596,6 @@ export default {
           }, {
             label: '汇率',
             prop: 'exchangeRate',
-            disabled: true,
           }, {
             label: '人民币金额',
             prop: 'rmbAmount',
@@ -624,6 +609,18 @@ export default {
           }, {
             label: '付款方式',
             prop: 'paymentType',
+          },
+          {
+            label: '到港日期',
+            prop: 'dateOfArrival',
+            type:'date',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           }, {
             label: '付款/开证日期',
             prop: 'accountsCollectionDate',
@@ -635,7 +632,20 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
+            label: '信用证到期日',
+            prop: 'creditDate',
+            type:'date',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '预付(保证)金额',
             prop: 'advancePayment',
             rules: [
@@ -655,10 +665,11 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '信用证到期日',
-            prop: 'creditDate',
-            type:'date',
+          },
+          {
+            label: '码单重量',
+            prop: 'billWeight',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -667,8 +678,8 @@ export default {
               }
             ]
           },  {
-            label: '码单重量',
-            prop: 'billWeight',
+            label: '发票重量',
+            prop: 'invoiceWeight',
             disabled: true,
             rules: [
               {
@@ -677,10 +688,11 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: '发票重量',
-            prop: 'invoiceWeight',
-            disabled: true,
+          },
+          {
+            label: '业务员',
+            prop: 'salesName',
+            dicData: [],
             rules: [
               {
                 required: false,
@@ -688,8 +700,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: "订单备注",
+          },{
+            label: "备注",
             span: 24,
             prop: "orderRemark",
             mock: {
@@ -743,6 +755,9 @@ export default {
     uploadFile
   },
   methods: {
+    valueName(value,row){
+      this.$set(row,"priceCategoryNames",value)
+    },
     //单价
     priceChange(row) {
       if (!row.price) {
@@ -1060,7 +1075,10 @@ export default {
     },
     //商品新增触发
     commoditySelection() {
-      this.$refs.crudContact.rowCellAdd();
+      const params = {
+        price:this.form.salesPrice
+      }
+      this.$refs.crudContact.rowCellAdd(params);
     },
     //点击行可编辑
     handleRowClick(row, event, column) {

src/views/purchase/contract/index.vue

@@ -57,13 +57,13 @@
           </el-button>
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button
+       <!--   <el-button
             type="text"
             icon="el-icon-view"
             size="small"
             @click.stop="beforeOpenPage(scope.row,1)"
           >查看
-          </el-button>
+          </el-button>-->
           <el-button
             type="text"
             icon="el-icon-edit"