AAA

src/router/page/index.js

@@ -784,6 +784,19 @@ export default [
     ],
   },
   {
+    path: '/putInStorage/transfer',
+    component: Layout,
+    redirect: '/putInStorage/transfer',
+    children: [
+      {
+        path: '/putInStorage/transfer',
+        name: '调拨登记',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/shengde/warehouse/putInStorage/transfer/register'),
+        props: true,
+      },
+    ],
+  },
+  {
     path: '/outbound/register',
     component: Layout,
     redirect: '/outbound/register',

src/views/shengde/group/BOM/library/index.vue

@@ -69,9 +69,9 @@
           </el-row>
 
           <div style="width: 100%; position: relative">
-            <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
+            <!-- <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
               <el-button type="primary" size="mini" @click="openOperationLog = true" v-db-click>操作日志</el-button>
-            </div>
+            </div> -->
             <el-table
               v-loading="loadingTable"
               :data="productList"

src/views/shengde/group/finance/reconciliation/print.vue

@@ -87,7 +87,8 @@
               <span>{{ item.skuPrice }}</span>
             </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
-              <span>{{ item.subtotalAmount }}</span>
+              <span>{{ subtotal(item) }}</span>
+              <!-- <span>{{ item.subtotalAmount }}</span> -->
             </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
               <span v-if="item.aftermarketQuantity && Number(item.aftermarketQuantity) !== 0">{{ item.aftermarketQuantity }}</span>
@@ -96,7 +97,8 @@
               <span v-if="item.aftermarketAmount && Number(item.aftermarketAmount) !== 0">-{{ item.aftermarketAmount }}</span>
             </td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomDetails.length">
-              <span>{{ item.amount }}</span>
+              <span>{{ getAllCost(item) }}</span>
+              <!-- <span>{{ item.amount }}</span> -->
             </td>
           </tr>
         </tbody>
@@ -216,60 +218,31 @@ export default {
     getAllCost(row) {
       let money = 0
       money = parseFloat(Number(row.skuPrice) * Number(row.quantity) - Number(row.aftermarketAmount)).toFixed(2)
-      // if (row.bomDetails && row.bomDetails.length > 0) {
-      //   row.bomDetails.map((item) => {
-      //     money = parseFloat(Number(money) + Number(this.getCost(row, item, item.bomColorQuantity))).toFixed(2)
-      //   })
-      // }
       return money
     },
     getAggregate() {
       let allMoney = 0
       if (this.tableList && this.tableList.length > 0) {
         this.tableList.map((item) => {
-          // allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
-          if (item.bomDetails && item.bomDetails.length > 0) {
-            item.bomDetails.map((itemBom) => {
-              if (itemBom.amount) {
-                allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
-              }
-              //     if (itemBom.dataResource === 1) {
-              //       if (item.productPrice) {
-              //         money = parseFloat(Number(money) + Number(item.productPrice)).toFixed(2)
-              //       }
-              //       if (item.processPrice && ['10', '20'].includes(item.processingLayout)) {
-              //         money = parseFloat(Number(money) + Number(item.processPrice)).toFixed(2)
-              //       }
-              //       if (item.deliverGoodsPrice) {
-              //         money = parseFloat(Number(money) + Number(item.deliverGoodsPrice)).toFixed(2)
-              //       }
-              //       if (item.expressPrice) {
-              //         money = parseFloat(Number(money) + Number(item.expressPrice)).toFixed(2)
-              //       }
-              //       if (item.expensePrice) {
-              //         money = parseFloat(Number(money) + Number(item.expensePrice)).toFixed(2)
-              //       }
-              //     } else {
-              //       if (itemBom.price) {
-              //         money = parseFloat(Number(money) + Number(itemBom.price)).toFixed(2)
-              //       }
-              //     }
-              //     if (itemBom.bomColorQuantity) {
-              //       allMoney = parseFloat(Number(allMoney) + Number(money) * Number(itemBom.bomColorQuantity)).toFixed(2)
-              //     }
-            })
-          }
+          allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
+          // if (item.bomDetails && item.bomDetails.length > 0) {
+          //   item.bomDetails.map((itemBom) => {
+          //     if (itemBom.amount) {
+          //       allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
+          //     }
+          //   })
+          // }
         })
       }
       return allMoney
     },
-    // subtotal(item) {
-    //   let num = 0
-    //   if (item.quantity && item.skuPrice) {
-    //     num = parseFloat(Number(item.quantity) * Number(item.skuPrice)).toFixed(2)
-    //   }
-    //   return num
-    // },
+    subtotal(item) {
+      let num = 0
+      if (item.quantity && item.skuPrice) {
+        num = parseFloat(Number(item.quantity) * Number(item.skuPrice)).toFixed(2)
+      }
+      return num
+    },
   },
 }
 </script>

src/views/shengde/group/finance/summary/print.vue

@@ -85,7 +85,8 @@
               <span>{{ item.skuPrice }}</span>
             </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
-              <span>{{ item.subtotalAmount }}</span>
+              <span>{{ subtotal(item) }}</span>
+              <!-- <span>{{ item.subtotalAmount }}</span> -->
             </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
               <span v-if="item.aftermarketQuantity && Number(item.aftermarketQuantity) !== 0">{{ item.aftermarketQuantity }}</span>
@@ -94,7 +95,8 @@
               <span v-if="item.aftermarketAmount && Number(item.aftermarketAmount) !== 0">-{{ item.aftermarketAmount }}</span>
             </td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomDetails.length">
-              <span>{{ item.amount }}</span>
+              <span>{{ getAllCost(item) }}</span>
+              <!-- <span>{{ item.amount }}</span> -->
             </td>
           </tr>
         </tbody>
@@ -215,60 +217,31 @@ export default {
     getAllCost(row) {
       let money = 0
       money = parseFloat(Number(row.skuPrice) * Number(row.quantity) - Number(row.aftermarketAmount)).toFixed(2)
-      // if (row.bomDetails && row.bomDetails.length > 0) {
-      //   row.bomDetails.map((item) => {
-      //     money = parseFloat(Number(money) + Number(this.getCost(row, item, item.bomColorQuantity))).toFixed(2)
-      //   })
-      // }
       return money
     },
     getAggregate() {
       let allMoney = 0
       if (this.tableList && this.tableList.length > 0) {
         this.tableList.map((item) => {
-          // allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
-          if (item.bomDetails && item.bomDetails.length > 0) {
-            item.bomDetails.map((itemBom) => {
-              if (itemBom.amount) {
-                allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
-              }
-              //     if (itemBom.dataResource === 1) {
-              //       if (item.productPrice) {
-              //         money = parseFloat(Number(money) + Number(item.productPrice)).toFixed(2)
-              //       }
-              //       if (item.processPrice && ['10', '20'].includes(item.processingLayout)) {
-              //         money = parseFloat(Number(money) + Number(item.processPrice)).toFixed(2)
-              //       }
-              //       if (item.deliverGoodsPrice) {
-              //         money = parseFloat(Number(money) + Number(item.deliverGoodsPrice)).toFixed(2)
-              //       }
-              //       if (item.expressPrice) {
-              //         money = parseFloat(Number(money) + Number(item.expressPrice)).toFixed(2)
-              //       }
-              //       if (item.expensePrice) {
-              //         money = parseFloat(Number(money) + Number(item.expensePrice)).toFixed(2)
-              //       }
-              //     } else {
-              //       if (itemBom.price) {
-              //         money = parseFloat(Number(money) + Number(itemBom.price)).toFixed(2)
-              //       }
-              //     }
-              //     if (itemBom.bomColorQuantity) {
-              //       allMoney = parseFloat(Number(allMoney) + Number(money) * Number(itemBom.bomColorQuantity)).toFixed(2)
-              //     }
-            })
-          }
+          allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
+          // if (item.bomDetails && item.bomDetails.length > 0) {
+          //   item.bomDetails.map((itemBom) => {
+          //     if (itemBom.amount) {
+          //       allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
+          //     }
+          //   })
+          // }
         })
       }
       return allMoney
     },
-    // subtotal(item) {
-    //   let num = 0
-    //   if (item.quantity && item.skuPrice) {
-    //     num = parseFloat(Number(item.quantity) * Number(item.skuPrice)).toFixed(2)
-    //   }
-    //   return num
-    // },
+    subtotal(item) {
+      let num = 0
+      if (item.quantity && item.skuPrice) {
+        num = parseFloat(Number(item.quantity) * Number(item.skuPrice)).toFixed(2)
+      }
+      return num
+    },
   },
 }
 </script>

src/views/shengde/group/order/orderManagement/index.vue

@@ -61,9 +61,9 @@
     </el-form>
 
     <div style="width: 100%; position: relative">
-      <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
+      <!-- <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
         <el-button type="primary" size="mini" @click="openOperationLog = true" v-db-click>操作日志</el-button>
-      </div>
+      </div> -->
       <el-table
         :data="tableList"
         :cell-style="{ padding: '0' }"

src/views/shengde/group/order/orderProductManagement/index.vue

@@ -67,7 +67,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
+    <!-- <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="24">
         <span>
           订单数量:
@@ -80,7 +80,7 @@
           <span style="margin-left: 4px" v-else>0</span>
         </span>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table
       :data="tableList"
@@ -241,9 +241,9 @@ export default {
           this.loading = false
         }
       )
-      API.contractProductStatistics(this.queryParams).then((res) => {
-        this.statisticsData = res.data.data
-      })
+      // API.contractProductStatistics(this.queryParams).then((res) => {
+      //   this.statisticsData = res.data.data
+      // })
     },
     handleQuery() {
       this.queryParams.pageNum = 1

src/views/shengde/group/subscription/management/details/detailedList.vue

@@ -70,7 +70,9 @@
                 </el-table>
               </div>
               <span slot="reference" style="cursor: pointer" @click="clickOnTheWay(scope.row)">
-                <span style="color: #ff0000; font-weight: 700">{{ getNum(scope.row) }}</span>
+                <span style="color: #ff0000; font-weight: 700" v-if="scope.row.purchaseQuantity">{{ Number(scope.row.purchaseQuantity) }}</span>
+                <span style="color: #ff0000; font-weight: 700" v-else>0</span>
+                <!-- <span style="color: #ff0000; font-weight: 700">{{ getNum(scope.row) }}</span> -->
               </span>
             </el-popover>
           </template>

src/views/shengde/product/groupSKU/index.vue

@@ -29,8 +29,8 @@
       <el-row :gutter="10" style="margin-bottom: 10px" v-if="!userInfo.subsidiaryId">
         <el-col :span="24">
           <el-button type="primary" size="mini" @click="handleAdd">添加产品</el-button>
-          <el-button type="primary" size="mini" @click="importExcel" v-db-click>导入Excel</el-button>
-          <el-button type="primary" size="mini" @click="historyManagement" v-db-click>导入历史管理</el-button>
+          <!-- <el-button type="primary" size="mini" @click="importExcel" v-db-click>导入Excel</el-button>
+          <el-button type="primary" size="mini" @click="historyManagement" v-db-click>导入历史管理</el-button> -->
         </el-col>
       </el-row>
 

src/views/shengde/product/management/index.vue

@@ -38,9 +38,9 @@
           <div style="margin-bottom: 15px" v-if="selectStatus"></div>
 
           <div style="width: 100%; position: relative">
-            <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
+            <!-- <div style="position: absolute; right: 0; top: -34px; width: 120px; text-align: center">
               <el-button type="primary" size="mini" @click="openOperationLog = true" v-db-click>操作日志</el-button>
-            </div>
+            </div> -->
             <el-table
               v-loading="loadingTable"
               :data="productList"

src/views/shengde/productionSystem/productionOperation/batching/stay.vue

@@ -52,7 +52,7 @@
       <el-button size="mini" @click="handleComplete">4. 完成备料</el-button>
     </el-row>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
+    <!-- <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="24">
         <span>
           订单数量:
@@ -65,7 +65,7 @@
           <span style="margin-left: 4px" v-else>0</span>
         </span>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table
       :data="tableList"
@@ -280,9 +280,9 @@ export default {
           this.loading = false
         }
       )
-      API.bladeStatistics(this.queryParams).then((res) => {
-        this.statisticsData = res.data.data
-      })
+      // API.bladeStatistics(this.queryParams).then((res) => {
+      //   this.statisticsData = res.data.data
+      // })
     },
     handleQuery() {
       this.queryParams.pageNum = 1

src/views/shengde/productionSystem/purchase/contract/contractDetails.vue

@@ -16,7 +16,7 @@
             <el-tab-pane label="退款信息" name="refund" v-if="JudgeAuthority('/shengde/productionSystem/purchase/contract/refund')">
               <RefundDetails v-if="activeName === 'refund'" :rowData="rowData"></RefundDetails>
             </el-tab-pane>
-            <el-tab-pane label="出入库明细" name="warehousing" v-if="JudgeAuthority('/shengde/productionSystem/purchase/contract/warehousing')">
+            <el-tab-pane label="入库明细" name="warehousing" v-if="JudgeAuthority('/shengde/productionSystem/purchase/contract/warehousing')">
               <WarehousingDetails v-if="activeName === 'warehousing'" :rowData="rowData"></WarehousingDetails>
             </el-tab-pane>
           </el-tabs>
@@ -211,7 +211,8 @@
 import Details from '@/views/shengde/productionSystem/purchase/contract/details/index'
 import PayDetails from '@/views/shengde/productionSystem/purchase/payment/details'
 import RefundDetails from '@/views/shengde/productionSystem/purchase/salesReturn/index'
-import WarehousingDetails from './WarehousingDetails'
+// import WarehousingDetails from './WarehousingDetails'
+import WarehousingDetails from '@/views/shengde/warehouse/putInStorage/details'
 import LabelTemplate from '@/components/LabelTemplate'
 import NewHistory from '@/views/activiti/include/NewHistory'
 import { mapGetters } from 'vuex'

src/views/shengde/productionSystem/purchase/contract/details/product.vue

@@ -38,7 +38,8 @@
         </el-table-column>
         <el-table-column label="已入库数量" width="100" v-if="!status">
           <template slot-scope="scope">
-            <span>{{ getNum(scope.row) }}</span>
+            <span v-if="scope.row.warehousingQuantity">{{ Number(scope.row.warehousingQuantity) }}</span>
+            <!-- <span>{{ getNum(scope.row) }}</span> -->
           </template>
         </el-table-column>
       </el-table>

src/views/shengde/productionSystem/purchase/inTransit/index.vue

@@ -16,11 +16,11 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
+    <!-- <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="5">
         <el-button type="primary" size="mini" @click="handleExcel" v-db-click>导出Excel</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table
       :data="tableList"

src/views/shengde/productionSystem/purchase/salesReturn/addOrModified.vue

@@ -183,7 +183,8 @@
 
 <script>
 import * as API from '@/api/shengde/productionSystem/purchase/salesReturn'
-import { purchaseContractGetList, purchaseContractDetail } from '@/api/shengde/productionSystem/purchase/contract'
+// import { purchaseContractGetList, purchaseContractDetail } from '@/api/shengde/productionSystem/purchase/contract'
+import { purchaseContractList, purchaseContractDetail } from '@/api/shengde/productionSystem/purchase/contract'
 import LabelTemplate from '@/components/LabelTemplate'
 import Utils from '@/util/transit'
 import { mapGetters } from 'vuex'
@@ -214,8 +215,11 @@ export default {
     }
   },
   created() {
-    purchaseContractGetList({}).then((res) => {
-      this.contractList = res.data.data.list
+    // purchaseContractGetList({}).then((res) => {
+    //   this.contractList = res.data.data.list
+    // })
+    purchaseContractList({ pageNum: 1, pageSize: 9999, type: 1 }).then((res) => {
+      this.contractList = res.data.data.records
     })
     this.rowData = this.$route.query
   },

src/views/shengde/subsidiary/order/management/index.vue

@@ -171,6 +171,14 @@
           <el-button type="text" @click="handleChangeOrder(scope.row.id)" v-if="scope.row.status === 0" v-db-click>编辑</el-button>
           <el-button type="text" v-if="scope.row.status == '30'" @click="handleAfterSales(scope.row)" v-db-click>售后</el-button>
           <el-button type="text" style="color: rgb(217, 0, 27)" @click="handleRemove(scope.row.id)" v-if="scope.row.status == 10" v-db-click>删除</el-button>
+          <el-button
+            type="text"
+            style="color: rgb(217, 0, 27)"
+            @click="handleRemove(scope.row.id)"
+            v-if="scope.row.dataResource === 0 && (scope.row.status == 0 || scope.row.status == 10)"
+            v-db-click
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>

src/views/shengde/subsidiary/order/productManagement/index.vue

@@ -61,7 +61,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
+    <!-- <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="24">
         <span>
           订单数量:
@@ -74,7 +74,7 @@
           <span style="margin-left: 4px" v-else>0</span>
         </span>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table
       :data="tableList"
@@ -248,9 +248,9 @@ export default {
           this.loading = false
         }
       )
-      API.contractProductStatistics(this.queryParams).then((res) => {
-        this.statisticsData = res.data.data
-      })
+      // API.contractProductStatistics(this.queryParams).then((res) => {
+      //   this.statisticsData = res.data.data
+      // })
     },
     /** 搜索按钮操作 */
     handleQuery() {

src/views/shengde/warehouse/putInStorage/single.vue

@@ -53,6 +53,7 @@
     <el-row :gutter="10" style="margin-bottom: 10px">
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleAdd" v-db-click>入库登记</el-button>
+        <!-- <el-button type="primary" size="mini" @click="handleTransfer" v-db-click>调拨登记</el-button> -->
       </el-col>
     </el-row>
 
@@ -210,6 +211,20 @@ export default {
         },
       })
     },
+    handleTransfer() {
+      let $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'
+      let maxPos = $chars.length
+      let random = ''
+      for (let i = 0; i < 32; i++) {
+        random += $chars.charAt(Math.floor(Math.random() * maxPos))
+      }
+      this.$router.push({
+        path: '/putInStorage/transfer',
+        query: {
+          random: random,
+        },
+      })
+    },
     clickPassword() {
       if (this.pwd) {
         if (this.pwd === 'sd2022') {