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

src/views/basicData/productInformation/configuration/mainList.json

@@ -83,6 +83,11 @@
       "width": 100
     },
     {
+      "label": "供应商",
+      "prop": "corpId",
+      "width": 100
+    },
+    {
       "label": "级别",
       "prop": "level",
       "width": 100

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -237,7 +237,7 @@ export default {
           {
             label: "供应商",
             prop: "corpId",
-             span:12,
+             span:16,
             rules: [
               {
                 required: true,

src/views/basicData/productInformation/index.vue

@@ -42,6 +42,9 @@
             >批量删除
             </el-button>
           </template>
+          <template slot-scope="scope" slot="corpId">
+            <span>{{ scope.row.corpName }}</span>
+          </template>
           <template slot-scope="scope" slot="menu">
 <!--            <el-button-->
 <!--                type="text"-->

src/views/businessManagement/deliveryNotice/configuration/mainListCost.json

@@ -1,4 +1,6 @@
 {
+  "height": "auto",
+  "calcHeight": 80,
   "headerAlign": "center",
   "align": "center",
   "border": true,
@@ -10,7 +12,9 @@
   "searchShowBtn": false,
   "menu": false,
   "simplePage": true,
-  "searchMenuSpan": 6,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
   "tree": true,
   "selection": true,
   "viewBtn": true,

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -62,8 +62,10 @@
                 <el-date-picker v-else-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]"
                                 size="small" type="date" placeholder="选择日期"
                                 :disabled="detailData.seeDisabled"/>
-                <selectComponent v-else-if="item.prop === 'corpId' || item.prop === 'salesCompany'" v-model="form[item.prop]"
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
                                  :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <selectComponent v-else-if="item.prop === 'salesCompany'" v-model="form[item.prop]" typeData="GS"
+                                 :configuration="companyConfiguration" style="width: 100%" :disabled="detailData.seeDisabled"/>
                 <el-select v-else-if="item.prop === 'deliveryStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="item.disabled || detailData.seeDisabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue" size="small"></el-option>
                 </el-select>
@@ -414,6 +416,13 @@ export default {
         placeholder: '请点击右边按钮选择',
         dicData: []
       },
+      companyConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
       configurationWarehouse: {
         multipleChoices: false,
         multiple: false,
@@ -772,7 +781,7 @@ export default {
       if (this.form.belongToCorpList) {
         this.$set(this.form, 'salesCompany', this.form.belongToCorpId)
         delete this.form.belongToCorpId
-        this.configuration.dicData = this.configuration.dicData.concat(this.form.belongToCorpList)
+        this.companyConfiguration.dicData = this.companyConfiguration.dicData.concat(this.form.belongToCorpList)
       }
       delete this.form.belongToCorpList
       this.$set(this.form, 'deliveryAmount', 0)
@@ -819,7 +828,7 @@ export default {
           this.$set(item, 'scale', (item.deliveryAmount / item.actualQuantity))
         })
         if (this.form.companyName) {
-          this.configuration.dicData = this.configuration.dicData.concat(this.form.companyName)
+          this.companyConfiguration.dicData = this.companyConfiguration.dicData.concat(this.form.companyName)
         }
         if (this.form.storageMap) {
           this.configurationWarehouse.dicData = this.form.storageMap

src/views/businessManagement/deliveryNotice/index.vue

@@ -30,10 +30,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
         </template>
         <template slot="corpIdSearch">
-          <select-component
+          <crop-select
             v-model="search.corpId"
-            :configuration="configuration"
-          ></select-component>
+            corpType="KH"
+          ></crop-select>
         </template>
         <template slot="salesCompanySearch">
           <select-component
@@ -370,11 +370,11 @@ export default {
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
-      if (data.businessDate) {
+      if (data.businessDate && data.businessDate != '') {
         data.businessStartDate = data.businessDate[0]+ " " + "00:00:00"
         data.businessEndDate = data.businessDate[1]+ " " + "23:59:59"
       }
-      if (data.createTime) {
+      if (data.createTime && data.createTime != '') {
         data.createTimeStart = data.createTime[0]+ " " + "00:00:00"
         data.createTimeEnd = data.createTime[1]+ " " + "23:59:59"
         this.$delete(data,'createTime')

src/views/businessManagement/inventoryAccount/index.vue

@@ -34,7 +34,7 @@
         </el-button>
         <el-button
             type="success"
-            icon="el-icon-upload2"
+            icon="el-icon-download"
             size="small"
             @click="derivation()"
         >下载模板

src/views/businessManagement/purchaseOrder/configuration/commodity.json

@@ -32,6 +32,7 @@
     {
       "label": "商品名称",
       "prop": "cname",
+      "search": true,
       "slot": true,
       "width": 100,
       "rules": [

src/views/businessManagement/purchaseOrder/configuration/mainListCost.json

@@ -1,4 +1,6 @@
 {
+  "height": "auto",
+  "calcHeight": 80,
   "headerAlign": "center",
   "align": "center",
   "border": true,
@@ -10,7 +12,9 @@
   "searchShowBtn": false,
   "menu": false,
   "simplePage": true,
-  "searchMenuSpan": 6,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
   "tree": true,
   "selection": true,
   "viewBtn": true,

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -76,7 +76,7 @@
                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" typeData="GYS"
                                  :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
                 <el-input
                   v-else-if="item.type == 'number'"
@@ -206,7 +206,7 @@
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
-                               :configuration="configuration" @receiveList="receiveList"/>
+                               :configuration="configuration" @receiveList="receiveList" typeData="GYS"/>
               <span v-else>
                 <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>
               </span>

src/views/businessManagement/purchaseOrder/index.vue

@@ -29,10 +29,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
         </template>
         <template slot="corpIdSearch">
-          <select-component
+          <crop-select
             v-model="search.corpId"
-            :configuration="configuration"
-          ></select-component>
+            corpType="GYS"
+          ></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.strCorpName }}</span>
@@ -342,12 +342,12 @@ export default {
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
-      if (data.requiredArrivalDate) {
+      if (data.requiredArrivalDate && data.requiredArrivalDate != '') {
         this.$set(data, 'requiredArrivalStartDate', data.requiredArrivalDate[0]+ " " + "00:00:00")
         this.$set(data, 'requiredArrivalEndDate', data.requiredArrivalDate[1]+ " " + "23:59:59")
         this.$delete(data,'requiredArrivalDate')
       }
-      if (data.createTime) {
+      if (data.createTime && data.createTime != '') {
         data.createStartTime = data.createTime[0]+ " " + "00:00:00"
         data.createEndTime = data.createTime[1]+ " " + "23:59:59"
         this.$delete(data,'createTime')

src/views/businessManagement/receipt/configuration/mainListCost.json

@@ -1,4 +1,6 @@
 {
+  "height": "auto",
+  "calcHeight": 80,
   "headerAlign": "center",
   "align": "center",
   "border": true,
@@ -10,7 +12,9 @@
   "searchShowBtn": false,
   "menu": false,
   "simplePage": true,
-  "searchMenuSpan": 6,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
   "tree": true,
   "selection": true,
   "viewBtn": true,

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -62,8 +62,10 @@
                 <el-date-picker v-else-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]"
                                 size="small" type="date" placeholder="选择日期"
                                 :disabled="detailData.seeDisabled"/>
-                <selectComponent v-else-if="item.prop === 'corpId' || item.prop === 'salesCompany'" v-model="form[item.prop]"
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
                                  :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <selectComponent v-else-if="item.prop === 'salesCompany'" v-model="form[item.prop]"
+                                 :configuration="companyConfiguration" style="width: 100%" :disabled="detailData.seeDisabled"/>
                 <el-select v-else-if="item.prop === 'purchaseMode'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in procurementMethodOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
@@ -386,6 +388,13 @@ export default {
         placeholder: '请点击右边按钮选择',
         dicData: []
       },
+      companyConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
       configurationWarehouse: {
         multipleChoices: false,
         multiple: false,
@@ -743,7 +752,7 @@ export default {
       if (this.form.belongToCorpList) {
         this.$set(this.form, 'salesCompany', this.form.belongToCorpId)
         delete this.form.belongToCorpId
-        this.configuration.dicData = this.configuration.dicData.concat(this.form.belongToCorpList)
+        this.companyConfiguration.dicData = this.companyConfiguration.dicData.concat(this.form.belongToCorpList)
       }
       delete this.form.belongToCorpList
       this.$set(this.form, 'deliveryAmount', 0)
@@ -799,7 +808,7 @@ export default {
         // 去重
         this.removeRepeat()
         if (this.form.companyName) {
-          this.configuration.dicData = this.configuration.dicData.concat(this.form.companyName)
+          this.companyConfiguration.dicData = this.companyConfiguration.dicData.concat(this.form.companyName)
         }
         delete this.form.deliveryItemsList
         delete this.form.deliveryFeesList

src/views/businessManagement/receipt/index.vue

@@ -30,10 +30,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
         </template>
         <template slot="corpIdSearch">
-          <select-component
+          <crop-select
             v-model="search.corpId"
-            :configuration="configuration"
-          ></select-component>
+            corpType="GYS"
+          ></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
@@ -376,18 +376,19 @@ export default {
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
-      if (data.businessDate) {
+      console.log(data)
+      if (data.businessDate && data.businessDate != '') {
         this.$set(data, 'businessStartDate', data.businessDate[0]+ " " + "00:00:00")
         this.$set(data, 'businessEndDate', data.businessDate[1]+ " " + "23:59:59")
         this.$delete(data,'businessDate')
       }
-      if (data.createTime) {
+      if (data.createTime && data.createTime != '') {
         this.$set(data, 'createStartTime', data.createTime[0]+ " " + "00:00:00")
         this.$set(data, 'createEndTime', data.createTime[1]+ " " + "23:59:59")
         this.$delete(data,'createTime')
       }
       this.page.currentPage = 1;
-      this.onLoad(this.page, data);
+      // this.onLoad(this.page, data);
     },
     //列保存触发
     async saveColumn() {

src/views/businessManagement/salesOrder/configuration/mainListCost.json

@@ -1,4 +1,6 @@
 {
+  "height": "auto",
+  "calcHeight": 80,
   "headerAlign": "center",
   "align": "center",
   "border": true,
@@ -10,7 +12,9 @@
   "searchShowBtn": false,
   "menu": false,
   "simplePage": true,
-  "searchMenuSpan": 6,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
   "tree": true,
   "selection": true,
   "viewBtn": true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -80,12 +80,14 @@
                                  v-model="form[item.prop]" :configuration="companyConfiguration"
                                  style="width: 100%"
                                  :disabled="detailData.seeDisabled"
+                                 typeData="GS"
                                  @returnBack="returnBack"/>
 <!--                生产工厂-->
                 <selectComponent v-else-if="item.prop === 'productionPlant'"
                                  v-model="form[item.prop]" :configuration="plantConfiguration"
                                  style="width: 100%"
                                  :disabled="detailData.seeDisabled"
+                                 typeData="GYS"
                                  @getRow="getPlantRow"/>
                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
@@ -170,6 +172,7 @@
               @row-del="rowDel"
               @saveColumn="saveColumn('goods')"
               :summary-method="summaryMethod"
+              :table-loading="goodsLoading"
           >
             <template slot="corpId" slot-scope="{ row, index }">
               <customer-dialog
@@ -1233,6 +1236,8 @@ export default {
       // 查询时loading页面
       pageLoading: false,
       switchDialog: false,
+      // 商品信息表格loading
+      goodsLoading: false,
       baseURL: '/api/blade-purchase-sales/orderitems/importPrice',
       headers: { "Blade-Auth": 'Bearer ' + getToken()},
     }
@@ -1489,12 +1494,10 @@ export default {
     },
     //文件上传时
     uploading(event, file, fileList) {
-      this.pageLoading = true;
-      // this.openFullScreen(false, '文件正在解析中');
+      this.openFullScreen(false, '文件正在解析中');
     },
     importTemplate(res, file) {
-      console.log(res)
-      this.pageLoading = false
+      this.openFullScreen(true)
       let goodsData = []
       res.data.forEach(item => {
         getMarketPrice({code: item.code}).then(res => {
@@ -1503,6 +1506,7 @@ export default {
           } else {
             this.$set(item, 'price', '0')
           }
+          this.$set(item, 'amount', (Number(item.price) * Number(item.orderQuantity)).toFixed(2))
         })
         getPurchasePrice({code: item.code}).then(res => {
           if (res.data.data.length > 0) {
@@ -1972,8 +1976,6 @@ export default {
     },
     //新增商品信息保存触发
     rowSave(row, done, loading) {
-      console.log(row)
-      console.log(this.contactsData)
       // this.contactsData.push(row)
       done()
     },
@@ -2152,6 +2154,7 @@ export default {
           }
           let packFee;
           if (this.form.packageRemarks) {
+            console.log(this.advantageProjectData)
             packFee = this.advantageProjectData.findIndex(item => item.feeName == '包装费')
           }
           if (packFee == -1) {

src/views/businessManagement/salesOrder/index.vue

@@ -46,10 +46,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
         </template>
         <template slot="corpIdSearch">
-          <select-component
+          <crop-select
             v-model="search.corpId"
-            :configuration="configuration"
-          ></select-component>
+            corpType="KH"
+          ></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
@@ -417,27 +417,27 @@ export default {
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
-      if (data.businesDate) {
+      if (data.businesDate && data.businessDate != '') {
         data.orderStartDate = data.businesDate[0]+ " " + "00:00:00"
         data.orderEndDate = data.businesDate[1]+ " " + "23:59:59"
         delete data.businesDate;
       }
-      if (data.requiredDeliveryDate) {
+      if (data.requiredDeliveryDate && data.requiredDeliveryDate != '') {
         data.deliveryStartDate = data.requiredDeliveryDate[0]+ " " + "00:00:00"
         data.deliveryEndDate = data.requiredDeliveryDate[1]+ " " + "23:59:59"
         this.$delete(data,'requiredDeliveryDate')
       }
-      if (data.requiredArrivalDate) {
+      if (data.requiredArrivalDate && data.requiredArrivalDate != '') {
         data.arrivalDateStart = data.requiredArrivalDate[0]+ " " + "00:00:00"
         data.arrivalDateEnd = data.requiredArrivalDate[1]+ " " + "23:59:59"
         this.$delete(data,'requiredArrivalDate')
       }
-      if (data.actualDeliveryDate) {
+      if (data.actualDeliveryDate && data.actualDeliveryDate != '') {
         data.actualDeliveryDateStart = data.actualDeliveryDate[0]+ " " + "00:00:00"
         data.actualDeliveryDateEnd = data.actualDeliveryDate[1]+ " " + "23:59:59"
         this.$delete(data,'actualDeliveryDate')
       }
-      if (data.createTime) {
+      if (data.createTime && data.createTime != '') {
         data.createTimeStart = data.createTime[0]+ " " + "00:00:00"
         data.createTimeEnd = data.createTime[1]+ " " + "23:59:59"
         this.$delete(data,'createTime')