修改国内贸易

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

@@ -28,6 +28,10 @@
     {
       "name": "inventoryAmount",
       "type": "sum"
+    },
+    {
+      "name": "invoiceWeight",
+      "type": "sum"
     }
   ],
   "column":[

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

@@ -24,6 +24,10 @@
     {
       "name": "deliveryAmount",
       "type": "sum"
+    },
+    {
+      "name": "totalQuantity",
+      "type": "sum"
     }
   ],
   "column": [

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -62,10 +62,23 @@
                 <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'" 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"/>
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="KH"
+                  :disabled="detailData.seeDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'salesCompany'"
+                  v-model="form[item.prop]"
+                  corpType="GS"
+                  :disabled="detailData.seeDisabled"
+                ></crop-select>
+<!--                <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>
@@ -787,6 +800,20 @@ export default {
       this.$set(this.form, 'deliveryAmount', 0)
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'totalCost', 0)
+      this.advantageProjectData = this.form.orderFeesList;
+      delete this.form.orderFeesList
+      this.advantageProjectData.forEach(item => {
+        delete item.createDept
+        delete item.createTime
+        delete item.createUser
+        delete item.id
+        delete item.isDeleted
+        delete item.pid
+        delete item.status
+        delete item.tenantId
+        delete item.updateTime
+        delete item.updateUser
+      })
       this.contactsData.forEach(item => {
         this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -76,8 +76,14 @@
                 <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]" typeData="GYS"
-                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="GYS"
+                  :disabled="detailData.seeDisabled"
+                ></crop-select>
+<!--                <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'"
                   placeholder="请输入"

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -62,28 +62,28 @@
                 <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'" 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"/>
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  corpType="KH"
+                  :disabled="detailData.seeDisabled"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'salesCompany'"
+                  v-model="form[item.prop]"
+                  corpType="GS"
+                  :disabled="detailData.seeDisabled"
+                ></crop-select>
+<!--                <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>
                 <el-select v-else-if="item.prop === 'warehouseType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in warehouseTypeOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-<!--                <avue-input-tree-->
-<!--                  v-else-if="item.prop === 'warehouseType'"-->
-<!--                  leaf-only-->
-<!--                  placeholder="请选择内容"-->
-<!--                  :dic="warehouseType"-->
-<!--                  type="tree"-->
-<!--                  v-model="form[item.prop]"-->
-<!--                  style="width: 100%"-->
-<!--                  size="small"-->
-<!--                  @change="warehouseTreeChange"-->
-<!--                >-->
-<!--                </avue-input-tree>-->
                 <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]"
                                   :configuration="configurationWarehouse" style="width: 100%" :disabled="detailData.seeDisabled"/>
                 <el-input

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -71,24 +71,47 @@
                                 size="small" type="date" placeholder="选择日期"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled"/>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"
-                                 @getRow="getCorpRow"
-                />
+                <crop-select
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  @getCorpData="getCorpRow"
+                  corpType="KH"
+                  :disabled="detailData.seeDisabled"
+                  style="width: 100%"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'belongToCorpId'"
+                  v-model="form[item.prop]"
+                  @getCorpData="returnBack"
+                  corpType="GS"
+                  :disabled="detailData.seeDisabled"
+                ></crop-select>
+                <crop-select
+                  v-else-if="item.prop === 'productionPlant'"
+                  v-model="form[item.prop]"
+                  @getCorpData="getPlantRow"
+                  corpType="GYS"
+                  :disabled="detailData.seeDisabled"
+                  style="width: 100%"
+                ></crop-select>
+<!--                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"-->
+<!--                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"-->
+<!--                                 @getRow="getCorpRow"-->
+<!--                />-->
 <!--                所属公司带出银行信息-->
-                <selectComponent v-else-if="item.prop === 'belongToCorpId'"
-                                 v-model="form[item.prop]" :configuration="companyConfiguration"
-                                 style="width: 100%"
-                                 :disabled="detailData.seeDisabled"
-                                 typeData="GS"
-                                 @returnBack="returnBack"/>
+<!--                <selectComponent v-else-if="item.prop === 'belongToCorpId'"-->
+<!--                                 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"/>
+<!--                <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>
                 </el-select>
@@ -175,12 +198,20 @@
               :table-loading="goodsLoading"
           >
             <template slot="corpId" slot-scope="{ row, index }">
-              <customer-dialog
+              <crop-select
                 v-if="row.$cellEdit"
-                v-model="row.corpName"
+                v-model="row.corpId"
                 :cropIndex="index"
-                @getcorpId="getcorpId"
-              ></customer-dialog>
+                corpType="GYS"
+                @getCorpData="getcorpId"
+                :disabled="detailData.seeDisabled"
+              ></crop-select>
+<!--              <customer-dialog-->
+<!--                v-if="row.$cellEdit"-->
+<!--                v-model="row.corpName"-->
+<!--                :cropIndex="index"-->
+<!--                @getcorpId="getcorpId"-->
+<!--              ></customer-dialog>-->
               <span v-else>{{ row.corpName }}</span>
             </template>
             <template slot="code" slot-scope="{row,index}">
@@ -2316,8 +2347,8 @@ export default {
         }
       }
     },
-    returnBack(val) {
-      getlistBankBy(val).then(res =>{
+    returnBack(row) {
+      getlistBankBy(row.id).then(res =>{
         this.$set(this.form, 'banks', null)
         this.$set(this.form, 'banksAccountName', null)
         this.$set(this.form, 'accountBank', null)
@@ -2382,6 +2413,9 @@ export default {
       }
       return sums;
     },
+    getCorpData(row) {
+      console.log(row)
+    },
   }
 }
 </script>