Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/benyun/components/byBill/byBill.vue

@@ -169,9 +169,15 @@ export default class ByBill extends VueViews {
       if(c.form){
         (this.$refs.billForm as any).setConfig(c.form)
       }
+      if(this.$refs.billTool){
+        (this.$refs.billTool as any).initTools()
+      }
       if(c?.tableConfig?.length > 0){
         let n = 0;
         for(const item of c.tableConfig){
+          if(this.$refs['tableTool_'+n]){
+            (this.$refs['tableTool_'+n] as any)[0].initTools();
+          }
           if(item.table && this.$refs['billTable_'+n]){
             (this.$refs['billTable_'+n] as any)[0].setConfig(item.table)
           }

src/benyun/components/byTool/byTool.vue

@@ -61,6 +61,11 @@ export default class GmTools extends Vue {
   showTools:Array<any>=[]
 
   created(){
+    this.initTools()
+  }
+
+  initTools(){
+    this.showTools = [];
     if(this.propConfig?.tools){
       this.setTool(this.propConfig?.tools)
     }
@@ -73,7 +78,6 @@ export default class GmTools extends Vue {
   }
 
   setTool(data:any){
-    this.showTools = [];
     for(const item of this.tools){
       if(data[item._class]){
         let obj:any = (this as any).$lodash.cloneDeep(item);

src/components/skuModal/productModal.vue

@@ -74,8 +74,8 @@ export default class ProductModal extends Vue {
         pageSize:10
       },
       columns:[{
-        title:'物料ID',
-        field:'materialId',
+        title:'编号',
+        field:'id',
         width:100
       },{
         title:'标题',

src/main.ts

@@ -40,6 +40,8 @@ import productStore from './components/productStore/productStore.vue'
 Vue.component('productStore', productStore);
 import buyer from './components/buyer/buyer.vue'
 Vue.component('by-buyer', buyer);
+import productSkuModal from './components/skuModal/productModal.vue';
+Vue.component('product-sku-modal', productSkuModal);
 
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size

src/views/oms/order/components/addOrder.vue

@@ -96,8 +96,8 @@
           <by-form :propConfig="invoicesConfig" ref="invoicesform"></by-form>
         </el-collapse-item>
       </el-collapse>
-      <productDialog ref="product" @confirm="confirmProduct" />
-      <productDialog ref="productGift" @confirm="confirmProductGift" />
+      <product-sku-modal ref="product" @confirm="confirmProduct" />
+      <product-sku-modal ref="productGift" @confirm="confirmProductGift" />
     </template>
     <template #footer v-if="!orderValue.id">
       <div class="btn">
@@ -914,8 +914,9 @@ export default class AddOrder extends Vue {
         }
         if(t){
           let obj:any={};
-          obj.name = item.name; //商品名称
+          obj.name = item.skuTitle; //商品名称
           obj.skuId = item.id; //商品编码
+          obj.itemId = item.materialId;
           obj.styleId = item.newNumber; //款式编码
           obj.qty = 1;
           if(isGift){
@@ -926,7 +927,7 @@ export default class AddOrder extends Vue {
             obj.isGift = 0;
           }
           
-          obj.basePrice = item.basePrice; //原价
+          // obj.basePrice = item.basePrice; //原价
           obj.amount = item.price;
           obj.stock = item.stock;
           nowData.push(obj)

src/views/oms/order/index.vue

@@ -459,6 +459,12 @@ export default class Order extends Vue {
       }
       ids.push(item.id)
     }
+    if(msg){
+      this.$message({
+        message:'单号“'+msg + '”未提交，不能生成采购单！'
+      })
+      return
+    }
     purchaseQty({
       ids:ids
     }).then(() => {