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

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

@@ -69,7 +69,7 @@
     },
     {
       "label": "规格尺寸",
-      "prop": "specs",
+      "prop": "typeno",
       "width": 100
     },
     {

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -124,7 +124,7 @@ export default {
           },
           {
             label: "规格",
-            prop: "specs",
+            prop: "typeno", //specs
             span: 8,
             rules: [
               {

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

@@ -85,7 +85,7 @@
       ]
     },{
       "label": "规格型号",
-      "prop": "specificationAndModel",
+      "prop": "typeno",
       "index": 4,
       "width":100,
       "cell": false,

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -50,18 +50,18 @@
                 <el-select v-else-if="item.prop === 'deliveryStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="item.disabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue" size="small"></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>
+<!--                <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>-->
                 <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
                   <el-option v-for="(item,index) in warehouseName" :key="index" :label="item.cname" :value="item.id" size="small"></el-option>
                 </el-select>
@@ -563,6 +563,10 @@ export default {
       }
       this.warehouseType = result
     });
+    selectWareHouse().then(res => {
+      console.log(res)
+      this.warehouseName = res.data.data.records
+    })
     if (this.detailData.id) {
       let id = this.detailData.id
       this.queryData(id)
@@ -762,7 +766,7 @@ export default {
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].specs
+          typeno: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -807,10 +811,10 @@ export default {
           console.log(this.tableData[item])
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].specs
+            typeno: this.tableData[item].typeno
           }).then(res =>{
             this.tableData[item].storageQuantity =  res.data.data
-            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specs)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
             this.tableData[item].itemId = this.tableData[item].id
             this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
             delete this.tableData[item].goodsTypeName

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

@@ -81,7 +81,7 @@
       ]
     },{
       "label": "规格型号",
-      "prop": "specificationAndModel",
+      "prop": "typeno",
       "index": 4,
       "width":100,
       "cell": false,

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -787,7 +787,7 @@ export default {
     rowCell(row, index) {
       console.log(row)
       if (row.$cellEdit) {
-        if (Number(row.orderQuantity) < Number(row.actualQuantity)) {
+        if (Number(row.purchaseQuantity) < Number(row.actualQuantity)) {
           return this.$message.error('订货数量不能小于发货数量')
         }
       }
@@ -836,12 +836,12 @@ export default {
         this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
-        this.contactsData[this.choiceIndexT].orderQuantity = 0
+        this.contactsData[this.choiceIndexT].purchaseQuantity = 0
         this.contactsData[this.choiceIndexT].price = 0
         this.contactsData[this.choiceIndexT].amount = 0
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].specs
+          typeno: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -886,15 +886,15 @@ export default {
         for (let item in this.tableData) {
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].specs
+            typeno: this.tableData[item].typeno
           }).then(res => {
-            this.tableData[item].storageQuantity =  res.data.data
+            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].specs)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
             this.$set(this.tableData[item], 'priceType', '一般')
-            this.$set(this.tableData[item], 'orderQuantity', 0)
+            this.$set(this.tableData[item], 'purchaseQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
             this.tableData[item].price = 0
             this.tableData[item].amount = 0
@@ -1119,7 +1119,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           for (let item in this.contactsData) {
-            if (Number(this.contactsData[item].orderQuantity) < Number(this.contactsData[item].actualQuantity)) {
+            if (Number(this.contactsData[item].purchaseQuantity) < Number(this.contactsData[item].actualQuantity)) {
               return this.$message.error('商品信息第'+ (parseInt(item) + 1) + '行订货数量不能小于发货数量')
             }
           }

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

@@ -86,7 +86,7 @@
       ]
     },{
       "label": "规格型号",
-      "prop": "specificationAndModel",
+      "prop": "typeno",
       "index": 4,
       "width":100,
       "cell": false,

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -50,18 +50,18 @@
                 <el-select v-else-if="item.prop === 'purchaseMode'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
                   <el-option v-for="(item,index) in procurementMethodOption" :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>
+<!--                <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>-->
                 <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
                   <el-option v-for="(item,index) in warehouseName" :key="index" :label="item.cname" :value="item.id" size="small"></el-option>
                 </el-select>
@@ -565,6 +565,9 @@ export default {
       }
       this.warehouseType = result
     });
+    selectWareHouse().then(res => {
+      this.warehouseName = res.data.data.records
+    })
     if (this.detailData.id) {
       this.queryData(this.detailData.id)
     }else if (this.detailData.form){
@@ -759,7 +762,7 @@ export default {
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          typeno: this.tableData[0].specs
+          typeno: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -804,7 +807,7 @@ export default {
         for (let item in this.tableData) {
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].specs
+            typeno: this.tableData[item].typeno
           }).then(res => {
             this.tableData[item].storageQuantity =  res.data.data
             this.tableData[item].itemId = this.tableData[item].id
@@ -813,7 +816,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].specs)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
             this.$set(this.tableData[item], 'purchaseQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
             this.$set(this.tableData[item], 'purchaseAmount', 0)

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

@@ -94,7 +94,7 @@
       ]
     },{
       "label": "规格型号",
-      "prop": "specificationAndModel",
+      "prop": "typeno",
       "index": 4,
       "width":100,
       "cell": true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1087,7 +1087,11 @@ export default {
           goodsNum.push(item.sort)
           purchaseAmount += Number(item.purchaseAmount)
         })
-        // this.form.grossProfitRate = (((Number(this.form.grossProfit) - Number(purchaseAmount)) / Number(this.form.grossProfit)) * 100).toFixed()
+        if (Number(this.form.grossProfit) != 0) {
+          this.form.grossProfitRate = (((Number(this.form.grossProfit) - Number(purchaseAmount)) / Number(this.form.grossProfit)) * 100).toFixed(2)
+        } else {
+          this.form.grossProfitRate = '0.00'
+        }
         if (goodsNum.length == 0) {
           this.maxGoodsNum = 0;
         } else {
@@ -1233,12 +1237,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].specs
+        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
         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].specs
+          typeno: this.tableData[0].typeno
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -1284,13 +1288,13 @@ export default {
           // this.$set(this.tableData[item], 'storageQuantity', 0)
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            typeno: this.tableData[item].specs
+            typeno: 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].specs)
+            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
             this.$set(this.tableData[item], 'priceType', '一般')
             this.$set(this.tableData[item], 'orderQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
@@ -1389,7 +1393,7 @@ export default {
       for (let item in list) {
         selectGoodsNum({
           goodsId: list[item].id,
-          typeno: list[item].specs
+          typeno: list[item].typeno
         }).then(res => {
           this.$set(list[item], 'storageQuantity', res.data.data)
         })

src/views/maintenance/goodsOnTheShelves/configuration/mainList.json

@@ -69,7 +69,7 @@
     },
     {
       "label": "规格尺寸",
-      "prop": "specs",
+      "prop": "typeno",
       "width": 100
     },
     {

src/views/orderManagement/orderList/index.vue

@@ -12,7 +12,7 @@
           <li @click="changeTags('已取消')"><span :class="{'active': tagsName == '已取消'}">已取消<div v-if="tagsName == '已取消'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
           <li @click="changeTags('售后中')"><span :class="{'active': tagsName == '售后中'}">售后中<div v-if="tagsName == '售后中'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
           <li @click="changeTags('售后结束')"><span :class="{'active': tagsName == '售后结束'}">售后结束<div v-if="tagsName == '售后结束'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
+          <li style="position: absolute;right: 20px" @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
         </ul>
       </div>
       <!--    分割线-->
@@ -50,7 +50,7 @@ export default {
     return {
       option: option,
       dataList: [{orderNo: '00001'}],
-      tagsName: '待付款',
+      tagsName: '全部',
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -95,7 +95,7 @@ export default {
   margin: 0;
   padding: 0 10px;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   li {
     list-style: none;
     font-size: 14px;
@@ -104,6 +104,7 @@ export default {
     align-items: center;
     position: relative;
     cursor: pointer;
+    margin-left: 30px;
     .orderNum {
       display: inline-block;
       font-size: 14px;

src/views/orderManagement/refund/index.vue

@@ -7,7 +7,7 @@
           <li @click="changeTags('处理中')"><span :class="{'active': tagsName == '处理中'}">处理中<div v-if="tagsName == '处理中'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
           <li @click="changeTags('已退款')"><span :class="{'active': tagsName == '已退款'}">已退款<div v-if="tagsName == '已退款'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
           <li @click="changeTags('拒绝退款')"><span :class="{'active': tagsName == '拒绝退款'}">拒绝退款<div v-if="tagsName == '拒绝退款'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li style="position: absolute;right: 15px" @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
+          <li style="position: absolute;right: 20px" @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
         </ul>
       </div>
       <!--    分割线-->