Merge remote-tracking branch 'origin/dev' into dev

src/api/basicData/basicFeesDesc.js

@@ -10,7 +10,7 @@ export function customerList(data) {
 }
 export const getDeptLazyTree = (parentId) => {
     return request({
-        url: '/api/blade-client/feestype/lazy-tree',
+        url: '/api/blade-client/goodstype/lazy-tree',
         method: 'get',
         params: {
             parentId

src/api/basicData/configuration.js

@@ -93,6 +93,15 @@ export const getDeptLazyTreeS = (parentId) => {
     })
 }
 
+//生成发货单
+export function generateShipment(data) {
+    return request({
+        url: '/api/blade-purchase-sales/order/deliverGoods',
+        method: 'post',
+        data:data
+    })
+}
+
 //政策列表查看明细
 export function detailList(data) {
     return request({

src/api/basicData/purchaseOrder.js

@@ -36,7 +36,7 @@ export function deleteDetails(data) {
 //商品从表列表删除
 export function corpsattn(data) {
     return request({
-        url: '/api/blade-purchase-sales/orderitems/update',
+        url: '/api/trade-purchase/domestic-order/removeByItem',
         method: 'post',
         data: {
             id:data

src/page/index/tags.vue

@@ -120,7 +120,7 @@
       //激活当前选项
       setActive() {
         this.data = this.active
-        console.log(this.active)
+        // console.log(this.active)
         this.active = this.tag.value;
       },
       menuTag(value, action) {

src/router/views/index.js

@@ -110,6 +110,7 @@ export default [{
         children: [
             {
                 path: '/deliveryNotice_detailsPageEdit',
+                name: '发货单',
                 meta: {
                     i18n: 'deliveryNotice_detailsPageEdit'
                 },

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -448,6 +448,10 @@ export default {
         delete this.form.deliveryFeesList
         delete this.form.deliveryFilesList
       });
+    }else if (this.$route.query.form){
+      this.form = JSON.parse(this.$route.query.form);
+      this.contactsData = this.form.orderItemsList
+      delete this.form.orderItemsList
     }
   },
   watch: {

src/views/businessManagement/deliveryNotice/index.vue

@@ -65,8 +65,6 @@ export default {
     }
   },
   created() {
-    console.log('wangbadan')
-    // this.onLoad()
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -486,7 +486,7 @@ export default {
             ]
           }, {
             label: '公司户头',
-            prop: 'banksAccountname',
+            prop: 'banksAccountName',
             rules: [
               {
                 required: true,
@@ -516,7 +516,7 @@ export default {
             ]
           }, {
             label: '要求到货日期',
-            prop: 'RequiredArrivalDate',
+            prop: 'requiredArrivalDate',
             type: 'datetime',
             rules: [
               {
@@ -528,7 +528,7 @@ export default {
           },{
             label: "备注",
             span: 24,
-            prop: "remarks",
+            prop: "orderRemark",
             mock: {
               type: 'county'
             }
@@ -542,12 +542,12 @@ export default {
     if (this.$route.query.id) {
       let id = this.$route.query.id.replace(/\"/g, "")
       detail(id).then(res => {
-        console.log(res.data.data)
+        console.log(res.data.data.itemsVOList)
         this.form = res.data.data;
-        this.contactsData = this.form.orderItemsList
+        this.contactsData = this.form.itemsVOList
         this.advantageProjectData = this.form.orderFeesList
         this.bankOfDepositData = this.form.orderFilesList
-        delete this.form.orderItemsList
+        delete this.form.itemsVOList
         delete this.form.orderFeesList
         delete this.form.orderFilesList
       });
@@ -833,7 +833,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           //商品信息
-          this.form.orderItemsList = this.contactsData
+          this.form.itemsVOList = this.contactsData
           this.form.orderFeesList = this.advantageProjectData
           this.form.orderFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -26,7 +26,9 @@
                 <!--                ></avue-input-tree>-->
                 <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"/>
-                <span v-else-if="item.prop === 'corpId'">{{form.corpName}}<el-button type="text" icon="el-icon-edit" @click="$refs.selectComponent.dialogVisible = true"></el-button></span>
+                <el-input v-else-if="item.prop === 'corpId'" disabled placeholder="请选择内容" v-model="form.corpName" class="input-with-select">
+                  <el-button slot="append" icon="el-icon-edit" @click="$refs.selectComponent.dialogVisible = true;this.customerDivide = 'corpId'" ></el-button>
+                </el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -39,6 +41,9 @@
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <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-input v-else-if="item.prop === 'belongToCorpId'" disabled placeholder="请选择内容" v-model="form.corpName" class="input-with-select">
+                  <el-button slot="append" icon="el-icon-edit" @click="$refs.selectComponent.dialogVisible = true;this.customerDivide = 'belongToCorpId'" ></el-button>
+                </el-input>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -54,6 +59,7 @@
               @row-save="rowSave"
               @row-click="handleRowClick"
               @row-update="rowUpdate"
+              @selection-change="productSelection"
               @row-del="rowDel"
           >
             <template slot="code" slot-scope="{row,index}">
@@ -79,6 +85,12 @@
                          size="small"
                          @click="policy">政策
               </el-button>
+              <el-button type="warning"
+                         icon="el-icon-plus"
+                         size="small"
+                         :disabled="selection.length < 1"
+                         @click="generateShipmentD">生成发货单
+              </el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -110,8 +122,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
-              >新增
-              </el-button>
+              >新增</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -400,7 +411,8 @@ import {
   corpsfiles,
   corpsitem,
   getList,
-  detailList
+  detailList,
+  generateShipment
 } from "@/api/basicData/configuration"
 import customerContact from "./configuration/customerContact.json"
 import advantageProject from "./configuration/advantageProject.json"
@@ -423,6 +435,7 @@ export default {
       dataPolicy: [],
       contactsDataBuyFree: [],
       loadingCost: false,
+      customerDivide: '',
       choiceData: false,
       commodityData: false,
       dataCost: [],
@@ -528,6 +541,7 @@ export default {
       dialogVisible: false,
       policyDialog: false,
       advantageProjectForm: {},
+      selection:[],
       bankOfDepositForm: {},
       contactsData: [],
       advantageProjectData: [],
@@ -952,9 +966,13 @@ export default {
     //选择客户触发
     selectCustomer(selection){
       console.log(selection)
-      this.$set(this.form,"corpId",selection[0].id)
-      this.$set(this.form,"corpName",selection[0].cname)
-      console.log(this.form)
+      if (this.customerDivide = 'corpId'){
+        this.$set(this.form,"corpId",selection[0].id)
+        this.$set(this.form,"corpName",selection[0].cname)
+      }else if (this.customerDivide = 'belongToCorpId'){
+        this.$set(this.form,"belongToCorpId",selection[0].id)
+        this.$set(this.form,"belongToCorpName",selection[0].cname)
+      }
     },
     //点击行可编辑
     handleRowClick(row, event, column) {
@@ -968,7 +986,7 @@ export default {
     //费用编辑
     rowCellTwo(row, index) {
       console.log(row)
-      this.$refs.crudProject.rowCell(row, index)
+      this.$refs.crudProject.rowCellTwo(row, index)
     },
     //费用新增触发
     costIncrease() {
@@ -984,6 +1002,43 @@ export default {
     policy(){
       this.policyDialog = !this.policyDialog
     },
+    //生成发货单
+    generateShipmentD(){
+      let lsit = []
+      for (let item in this.selection){
+        if (!this.selection[item].id){
+          return this.$confirm('商品信息有未保存数据, 是否立即保存?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.editCustomer()
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });
+          });
+          }else {
+          lsit.push(this.selection[item].id)
+        }
+      }
+      let data = {
+        id:this.form.id,
+        orderItemIds: lsit
+      }
+      generateShipment(data).then(res=>{
+        console.log(res.data.data)
+        this.$router.push({
+          path: "deliveryNotice_detailsPageEdit",
+          query: {form: JSON.stringify(res.data.data)},
+        });
+      })
+    },
+    //商品选中触发
+    productSelection(selection){
+      this.selection = selection
+    },
     //点击费用明细选择触发
     choice(row) {
       this.dialogCost = !this.dialogCost