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

src/config/website.js

@@ -45,5 +45,5 @@ export default {
   // 流程设计器地址
   flowDesignUrl: 'http://192.168.1.177:9999',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
-  reportUrl: 'http://trade.tubaosoft.com:10020/ureport',
+  reportUrl: 'https://trade.tubaosoft.com/ureport',
 }

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -14,6 +14,7 @@
         class="el-button--small-yh add-customer-btn"
         type="primary"
         :disabled="disabled"
+        size="small"
         @click="editCustomer"
         >{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
@@ -923,39 +924,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
-
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -11,6 +11,7 @@
           type="primary"
           :disabled="disabled"
           @click="editProductInfo"
+          size="small"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
     </div>
@@ -303,26 +304,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
 
 .back-icon {
   line-height: 64px;
@@ -330,12 +311,6 @@ export default {
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
-
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -13,6 +13,7 @@
           style="right: 245px;"
           type="primary"
           @click="revokeOutGoods"
+          size="small"
           v-if="form.deliveryStatus !== '录入'"
           :disabled="detailData.seeDisabled"
         >撤销发货</el-button>
@@ -21,13 +22,15 @@
           style="right: 245px;"
           type="primary"
           @click="sendOutGoods"
+          size="small"
           v-if="form.deliveryStatus == '录入'"
-          :disabled="detailData.seeDisabled"
+          :disabled="detailData.seeDisabled || !form.id"
         >确认发货</el-button>
         <el-button
           class="el-button--small-yh"
+          size="small"
           type="success" style="right: 140px;" @click="copyOrder"
-          :disabled="detailData.seeDisabled || !this.form.id">
+          :disabled="detailData.seeDisabled || !form.id">
           复制新单
         </el-button>
         <el-button
@@ -36,11 +39,12 @@
           :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
           :loading="saveLoading"
+          size="small"
         >{{ form.id ? '确认修改' : '确认新增' }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -771,6 +775,7 @@ export default {
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'totalCost', 0)
       this.contactsData.forEach(item => {
+        this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "srcId", item.id)
         this.$set(item, "actualQuantity", (Number(item.orderQuantity) - Number(item.actualQuantity)))
@@ -955,12 +960,12 @@ export default {
         this.contactsData[this.choiceIndexT].cname = this.tableData[0].cname
         this.contactsData[this.choiceIndexT].code = this.tableData[0].code
         this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
-        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
+        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -1005,10 +1010,10 @@ export default {
           console.log(this.tableData[item])
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].typeno
+            itemType: this.tableData[item].typeno
           }).then(res =>{
             this.tableData[item].storageQuantity =  res.data.data
-            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].typeno)
             this.tableData[item].itemId = this.tableData[item].id
             this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
             delete this.tableData[item].goodsTypeName
@@ -1342,9 +1347,9 @@ export default {
     },
     // 导入销售明细
     importMarket(list) {
-      console.log(list)
       list.forEach(item => {
         item.cname = item.cname
+        this.$set(item, 'specificationAndModel', item.itemType)
         delete item.id
         delete item.createTime
         delete item.createUser
@@ -1392,26 +1397,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
+//.customer-head {
+//  position: fixed;
+//  top: 105px;
+//  width: 100%;
+//  margin-left: -10px;
+//  height: 62px;
+//  background: #ffffff;
+//  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+//  z-index: 999;
+//}
+//
+//.customer-back {
+//  cursor: pointer;
+//  line-height: 62px;
+//  font-size: 16px;
+//  color: #323233;
+//  font-weight: 400;
+//}
 
 .back-icon {
   line-height: 64px;
@@ -1419,11 +1422,11 @@ export default {
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
+//.add-customer-btn {
+//  position: fixed;
+//  right: 36px;
+//  top: 115px;
+//}
 
 ::v-deep .el-form-item {
   margin-bottom: 0;

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

@@ -60,7 +60,7 @@
       "label": "商品名称",
       "prop": "cname",
       "index": 1,
-      "width":100,
+      "width":230,
       "cell": false,
       "overHidden": true,
       "rules": [

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -9,6 +9,7 @@
       </div>
       <div class="add-customer-btn">
         <el-button
+          size="small"
           class="el-button--small-yh"
           type="success" style="right: 140px;" @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id"
@@ -16,6 +17,7 @@
           复制新单
         </el-button>
         <el-button
+          size="small"
           class="el-button--small-yh"
           type="primary"
           :disabled="disabled || detailData.seeDisabled"
@@ -25,7 +27,7 @@
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -72,6 +74,13 @@
               @selection-change="productSelection"
               @saveColumn="saveColumn('goods')"
           >
+            <template slot="cname" slot-scope="{ row }">
+              <goods-select v-if="row.$cellEdit" v-model="row.cname" @getRow="getGoodsRow($event, row)"
+                            :configuration="goodsConfiguration" @receiveList="receiveGoodList" @returnRow="getRow($event, row)"/>
+              <span v-else>
+                <span v-for="item in goodsConfiguration.dicData" v-if="item.cname == row.cname">{{ item.cname }}</span>
+              </span>
+            </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <el-input
                 v-if="row.$cellEdit"
@@ -380,6 +389,13 @@ export default {
         placeholder: '请点击右边按钮选择',
         dicData: []
       },
+      goodsConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
       form: {},
       data: [],
       loadingCost: false,
@@ -487,7 +503,7 @@ export default {
             prop: 'srcOrderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -657,6 +673,15 @@ export default {
         this.configuration.dicData = this.configuration.dicData.concat(feesData)
         // 去重
         this.removeRepeat()
+        let goodsData = []
+        this.form.orderItemsList.forEach(item => {
+          let a = {
+            cname: item.cname,
+          }
+          goodsData.push(a)
+        })
+        this.goodsConfiguration.dicData = [].concat(goodsData)
+        this.removeGoodsRepeat()
         delete this.form.itemsVOList
         delete this.form.orderFeesList
         delete this.form.orderFilesList
@@ -717,6 +742,31 @@ export default {
     copyOrder() {
       this.queryData(this.form.id, true)
     },
+    getGoodsRow(event,row) {
+      row.priceCategory = event.goodsTypeName
+      row.code = event.code
+      row.typeno = event.typeno
+      row.itemType = event.typeno
+      row.itemId = event.id
+    },
+    receiveGoodList(data) {
+      this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(data)
+      this.removeGoodsRepeat()
+    },
+    getRow(event,row) {
+      row.priceCategory = event[0].goodsTypeName
+      row.code = event[0].code
+      row.typeno = event[0].typeno
+      row.itemType = event[0].typeno
+      row.itemId = event[0].id
+    },
+    removeGoodsRepeat() {
+      let obj = []
+      this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.reduce((current,next) => {
+        obj[next.id] ? '': obj[next.id] = true && current.push(next)
+        return current
+      }, [])
+    },
     getShipmentC() {
       console.log(this.$store.getters.domTakeStatus)
       if (this.$store.getters.domTakeStatus) {
@@ -838,7 +888,7 @@ export default {
         this.contactsData[this.choiceIndexT].cname = this.tableData[0].cname
         this.contactsData[this.choiceIndexT].code = this.tableData[0].code
         this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
-        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
+        this.contactsData[this.choiceIndexT].itemType = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
         this.contactsData[this.choiceIndexT].orderQuantity = 0
@@ -846,7 +896,7 @@ export default {
         this.contactsData[this.choiceIndexT].amount = 0
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -889,13 +939,14 @@ export default {
         for (let item in this.tableData) {
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].typeno
+            itemType: this.tableData[item].typeno
           }).then(res => {
             this.$set(this.tableData[item], 'storageQuantity', res.data.data)
             this.tableData[item].itemId = this.tableData[item].id
             this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
             delete this.tableData[item].id
-            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
+            this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].typeno)
             this.$set(this.tableData[item], 'priceType', '一般')
             this.$set(this.tableData[item], 'orderQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
@@ -1214,38 +1265,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
+//.add-customer-btn {
+//  position: fixed;
+//  right: 36px;
+//  top: 115px;
+//}
 
 ::v-deep .el-form-item {
   margin-bottom: 0;

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -13,6 +13,7 @@
           style="right: 245px;"
           type="primary"
           @click="revokeInGoods"
+          size="small"
           v-if="form.deliveryStatus !== '录入'"
           :disabled="detailData.seeDisabled"
         >撤销收货</el-button>
@@ -21,11 +22,13 @@
           style="right: 245px;"
           type="primary"
           @click="sendInGoods"
+          size="small"
           v-if="form.deliveryStatus == '录入'"
           :disabled="detailData.seeDisabled"
         >确认收货</el-button>
         <el-button
           class="el-button--small-yh"
+          size="small"
           type="success" style="right: 140px;" @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id">
           复制新单
@@ -35,12 +38,13 @@
           type="primary"
           :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
+          size="small"
           :loading="saveLoading"
         >{{ form.id ? '确认修改' : '确认新增' }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -742,6 +746,7 @@ export default {
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'purchaseAmount', 0)
       this.contactsData.forEach(item => {
+        this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "inventoryNumber", item.storageQuantity)
         this.$set(item, "srcId", item.id)
@@ -919,11 +924,11 @@ export default {
         this.contactsData[this.choiceIndexT].cname = this.tableData[0].cname
         this.contactsData[this.choiceIndexT].code = this.tableData[0].code
         this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
-        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
+        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -968,7 +973,7 @@ export default {
         for (let item in this.tableData) {
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].typeno
+            itemType: this.tableData[item].typeno
           }).then(res => {
             this.tableData[item].storageQuantity =  res.data.data
             this.tableData[item].itemId = this.tableData[item].id
@@ -977,7 +982,7 @@ export default {
             delete this.tableData[item].id
             delete this.tableData[item].status
             delete this.tableData[item].isDeleted
-            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].typeno)
             this.$set(this.tableData[item], 'purchaseQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
             this.$set(this.tableData[item], 'purchaseAmount', 0)
@@ -1332,26 +1337,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
+//.customer-head {
+//  position: fixed;
+//  top: 105px;
+//  width: 100%;
+//  margin-left: -10px;
+//  height: 62px;
+//  background: #ffffff;
+//  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+//  z-index: 999;
+//  /* display: flex;
+//  justify-content: left; */
+//}
+//
+//.customer-back {
+//  cursor: pointer;
+//  line-height: 62px;
+//  font-size: 16px;
+//  color: #323233;
+//  font-weight: 400;
+//}
 
 .back-icon {
   line-height: 64px;
@@ -1359,11 +1364,11 @@ export default {
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
+//.add-customer-btn {
+//  position: fixed;
+//  right: 36px;
+//  top: 115px;
+//}
 
 ::v-deep .el-form-item {
   margin-bottom: 0;

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

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 300,
+  "menuWidth": 130,
   "dialogClickModal": false,
   "searchLabelWidth": 100,
   "searchIcon": true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -40,7 +40,7 @@
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -945,8 +945,8 @@ export default {
               }
             ]
           }, {
-            label: '付款方式',
-            prop: 'paymentType',
+            label: '到货地址',
+            prop: 'arrivalAddress',
             rules: [
               {
                 required: true,
@@ -955,8 +955,8 @@ export default {
               }
             ]
           }, {
-            label: '到货地址',
-            prop: 'arrivalAddress',
+            label: '付款方式',
+            prop: 'paymentType',
             rules: [
               {
                 required: true,
@@ -1080,6 +1080,7 @@ export default {
     })
     this.$set(this.form, 'orderStatus', '录入')
     this.$set(this.form, 'overPayment', 0)
+    this.$set(this.form, 'orderAmount', 0)
     if (this.detailData.id) {
       this.queryData(this.detailData.id)
     }
@@ -1101,6 +1102,7 @@ export default {
       this.$set(row, 'priceType', '一般')
       row.code = event.code
       row.typeno = event.typeno
+      row.itemType = event.typeno
       row.itemId = event.id
     },
     queryData(id, isCopy = false){
@@ -1380,11 +1382,11 @@ export default {
       this.removeGoodsRepeat()
     },
     getRow(event,row) {
-      console.log(event,row)
       row.priceCategory = event[0].goodsTypeName
       this.$set(row, 'priceType', '一般')
       row.code = event[0].code
       row.typeno = event[0].typeno
+      row.itemType = event[0].typeno
       row.itemId = event[0].id
     },
     //点击商品明细选择触发
@@ -1401,12 +1403,12 @@ export default {
         this.contactsData[this.choiceIndexT].cname = this.tableData[0].cname
         this.contactsData[this.choiceIndexT].code = this.tableData[0].code
         this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
-        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
+        this.contactsData[this.choiceIndexT].itemType = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -1452,17 +1454,17 @@ export default {
           // this.$set(this.tableData[item], 'storageQuantity', 0)
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].typeno
+            itemType: this.tableData[item].typeno
           }).then(res => {
             this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
             this.tableData[item].storageQuantity =  res.data.data
             delete this.tableData[item].goodsTypeName
             this.tableData[item].itemId = this.tableData[item].id
-            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
+            this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
             this.$set(this.tableData[item], 'priceType', '一般')
             this.$set(this.tableData[item], 'orderQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
-            this.$set(this.tableData[item], 'purchaseAmount', 0)
+            this.$set(this.tableData[item], 'purchaseAmount', '0')
             this.tableData[item].price = '0'
             this.tableData[item].amount = 0
             this.tableData[item].sort = this.maxGoodsNum + 1
@@ -1569,7 +1571,7 @@ export default {
       for (let item in list) {
         selectGoodsNum({
           goodsId: list[item].itemId,
-          typeno: list[item].typeno
+          itemType: list[item].typeno
         }).then(res => {
           this.$set(list[item], 'storageQuantity', res.data.data)
           if (this.policyDataTwo.length > 0) {
@@ -1582,7 +1584,9 @@ export default {
           this.$set(list[item], 'price', list[item].salesPrice)
           this.$set(buyFree[item], 'price', '0')
           this.$set(buyFree[item], 'orderQuantity',  list[item].salesVolume)
+          this.$set(buyFree[item], 'itemType',  list[item].typeno)
         }
+        this.$set(list[item], 'itemType',  list[item].typeno)
         this.$set(list[item], 'actualQuantity', 0)
         this.$set(list[item], 'orderQuantity', 0)
         this.$set(list[item], 'amount', 0)
@@ -1886,6 +1890,7 @@ export default {
       }
     },
     priceChange(row) {
+      console.log(row.price)
       if (!row.price) {
         row.price = 0;
       } else {
@@ -1946,26 +1951,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
+//.customer-head {
+//  position: fixed;
+//  top: 105px;
+//  width: 100%;
+//  margin-left: -10px;
+//  height: 62px;
+//  background: #ffffff;
+//  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+//  z-index: 999;
+//  /* display: flex;
+//  justify-content: left; */
+//}
+//
+//.customer-back {
+//  cursor: pointer;
+//  line-height: 62px;
+//  font-size: 16px;
+//  color: #323233;
+//  font-weight: 400;
+//}
 
 .back-icon {
   line-height: 64px;
@@ -1973,11 +1978,11 @@ export default {
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
+//.add-customer-btn {
+//  position: fixed;
+//  right: 36px;
+//  top: 115px;
+//}
 
 ::v-deep .el-form-item {
   margin-bottom: 0;

src/views/businessManagement/salesOrder/index.vue

@@ -24,6 +24,9 @@
                  @tree-load="treeLoad"
                  :cell-style="tableRowClassName"
       >
+        <template slot-scope="scope" slot="orgOrderNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
+        </template>
         <template slot="corpIdSearch">
           <select-component
             v-model="search.corpId"
@@ -31,7 +34,7 @@
           ></select-component>
         </template>
         <template slot-scope="scope" slot="corpId">
-          {{ scope.row.corpsName }}
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
         </template>
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
@@ -41,13 +44,13 @@
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button
-            type="text"
-            icon="el-icon-view"
-            size="small"
-            @click.stop="beforeOpenPage(scope.row,scope.index)"
-          >查看
-          </el-button>
+<!--          <el-button-->
+<!--            type="text"-->
+<!--            icon="el-icon-view"-->
+<!--            size="small"-->
+<!--            @click.stop="beforeOpenPage(scope.row,scope.index)"-->
+<!--          >查看-->
+<!--          </el-button>-->
           <el-button
             type="text"
             icon="el-icon-edit"

src/views/maintenance/priceLibrary/detailsPage.vue

@@ -16,16 +16,16 @@
           type="primary"
           :disabled="disabled"
           @click="editCustomer"
+          size="small"
           :loading="subLoading"
           v-if="detailData.status != 1"
-          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div class="customer-main">
+    <div style="margin-top: 60px;margin-bottom:35px">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container>
+      <basic-container style="margin-bottom: 10px">
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
@@ -390,6 +390,46 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.customer-head {
+  position: fixed;
+  top: 105px;
+  width: 100%;
+  margin-left: -10px;
+  height: 62px;
+  background: #ffffff;
+  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+  z-index: 999;
+}
+
+.customer-back {
+  cursor: pointer;
+  line-height: 62px;
+  font-size: 16px;
+  color: #323233;
+  font-weight: 400;
+}
+
+.back-icon {
+  line-height: 64px;
+  font-size: 20px;
+  margin-right: 8px;
+}
+.sell-customer-btn {
+  position: fixed;
+  right: 244px;
+  top: 115px;
+}
+.copy-customer-btn {
+  position: fixed;
+  right: 140px;
+  top: 115px;
+}
+
+.add-customer-btn {
+  position: fixed;
+  right: 36px;
+  top: 115px;
+}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -11,6 +11,7 @@
           class="el-button--small-yh add-customer-btn"
           type="primary"
           :disabled="disabled"
+          size="small"
           @click="editCustomer"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -670,26 +671,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
 
 .back-icon {
   line-height: 64px;
@@ -697,12 +678,6 @@ export default {
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
-
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }

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

@@ -10,11 +10,12 @@
           class="el-button--small-yh add-customer-btn"
           type="primary"
           :disabled="disabled"
+          size="small"
           @click="editProductInfo"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container style="margin-bottom: 10px">
         <avue-form ref="form" v-model="form" :option="option">
@@ -277,7 +278,7 @@ export default {
           {
             label: "推广词",
             prop: "promote",
-            span: 8,
+            span: 24,
             rules: [
               {
                 required: true,
@@ -527,38 +528,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
   margin-right: 8px;
 }
 
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 
 ::v-deep .el-form-item {
   margin-bottom: 0;