客户销售

src/views/basic_data/stock/adjust_warehouse.vue

@@ -121,17 +121,16 @@ export default {
             >
               审批
             </el-button>
-            <el-button
-              size="mini"
-              type="text" onClick={() => {
-              deleteCustomerStockOrder({ id: row.id }).then(res => {
-                this.$successMsg('删除成功')
-                this.$refs.pageRef.getTableData()
-              })
-            }}
+            <el-popconfirm
+              onOnConfirm = {()=>{
+                deleteCustomerStockOrder({ id: row.id }).then(res => {
+                  this.$successMsg('删除成功')
+                  this.$refs.pageRef.getTableData()
+                })              }}
+              title="删除吗？"
             >
-              删除
-            </el-button>
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popconfirm>
           </div>
         )
       }

src/views/sales/sales_management/components/customer_sales_form.vue

@@ -72,24 +72,27 @@ export default {
         },
         {
           prop: 'stockLockQty',
-          label: '库存',
+          label: '库存数量',
           width: '180'
         },
         {
-          prop: 'directFlag',
-          label: '发生方向',
+          prop: 'qty',
+          label: '数量',
           width: '180',
-          isCustom: true
-
+          isInput: true
         },
         {
-          prop: 'stockChangeQty',
-          label: '数量',
+          prop: 'volume',
+          label: '体积',
+          width: '180',
+        },
+        {
+          prop: 'totalVolume',
+          label: '总体积',
           width: '180',
-          isInput: true
         },
         {
-          prop: 'remark',
+          prop: 'notes',
           label: '备注',
           width: '180',
           isInput: true
@@ -135,6 +138,7 @@ export default {
       })
       const params = {
         ...this.$refs.header.screenForm,
+        
         orders: this.dataList
       }
       addFrontOrder(params).then(res => {

src/views/sales/sales_management/customer_sales_list.vue

@@ -11,7 +11,7 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <customer_sales_form v-if="pageType===1" />
+    <customer_sales_form v-else-if="pageType===1" />
     <customer_sales_details v-else/>
   </div>
 </template>