Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

assets/css/base.less

@@ -586,7 +586,11 @@ div::-webkit-scrollbar-corner {
   transform: scale(.96);
 }
 
-
+/*字体颜色*/
+.font_fff
+{
+  color:#fff;
+}
 /*按钮颜色*/
 
 .bluebg {
@@ -1479,3 +1483,7 @@ html [type=button] {
 .bgDDD{
   background:#DDD
 }
+.ftball {
+  background: rgba(0, 0, 0, 0.7);
+  color: #fff;
+}
\ No newline at end of file

pages/aps/plan/index.vue

@@ -58,7 +58,7 @@
       </template>
       <template slot="buttons"></template>
     </DataGrid>
-    <FooterToolbar extra v-if="footerBar">
+    <FooterToolbar extra v-if="footerBar" class="ftball">
       <Row>
         <Checkbox @on-change="handleSelectAll(single)" v-model="single">全选</Checkbox>
         <span class="footerSpan">已选 {{selectCount}} 项</span>

pages/aps/supprotMain/accessory.vue

@@ -145,11 +145,11 @@ export default {
             );
           },
         },
-        {
-          key: "remark",
-          title: this.l("remark"),
-          align: "left",
-        },
+        // {
+        //   key: "remark",
+        //   title: this.l("remark"),
+        //   align: "left",
+        // },
       ],
       datas: [],
       tableHeight1: "",

pages/aps/supprotMain/outbound.vue

@@ -109,11 +109,11 @@ export default {
             );
           },
         },
-        {
-          key: "remark",
-          title: this.l("remark"),
-          align: "left",
-        },
+        // {
+        //   key: "remark",
+        //   title: this.l("remark"),
+        //   align: "left",
+        // },
       ],
       datas: [],
       splitHeight: "",
@@ -377,8 +377,5 @@ export default {
 };
 </script>
 <style scoped>
-.ftball {
-  background: rgba(0, 0, 0, 0.7);
-  color: #fff;
-}
+
 </style>
\ No newline at end of file

pages/produce/orderlist.vue

@@ -133,6 +133,7 @@ export default {
           op: "mesCode,productName,drawnNumber",
           value: null
         }
+        //status: { op: "Equal", value: 0 }
       },
       downUrl: fileUrlDown,
       columns: [

pages/technology/productMix/product/index.vue

@@ -40,7 +40,7 @@
           <Row class="row-down" :gutter="10">
             <Col span="7">
               <div class="img-i">
-                <img :src="downUrl +row.productUrl" />
+                <img :src="downUrl +row.productUrl" onerror="this.src='/imgicon/noPic_product.png';"/>
               </div>
             </Col>
             <Col span="17" class="c">
@@ -234,7 +234,6 @@ export default {
   },
   mounted() {
     this.$refs.grid.reload(this.easySearch);
-    // console.log(this);
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -287,7 +286,6 @@ export default {
       this.fullscreen = false;
     },
     view(row) {
-      // console.log(row)
       this.curId = row.id;
       this.parent.id = row.levelId;
       this.parent.parentName = row.levelTitle;

pages/technology/setProcess/api.js

@@ -14,4 +14,7 @@ export default {
   ordersetroutingids(params) {
     return Api.post(`${technologyUrl}orderrouting/ordersetroutingids`, params);
   },
+  createnew(params) {
+    return Api.post(`${technologyUrl}materiallist/createnew`, params);
+  },
 }

pages/technology/setProcess/index.vue

@@ -61,7 +61,8 @@ export default {
         productingPreparationPeople: 0,
         orderIds: 0,
         ids: [],
-      },
+        count:0
+,      },
       detail: null,
       modal: false,
       easySearch: {
@@ -142,6 +143,7 @@ export default {
         this.child.productingPreparationPeople =
           row.productingPreparationPeople;
         this.child.orderIds = row.id;
+        this.child.count=row.quantity;
         this.title = "工艺列表";
         this.detail = () => import("./set");
         this.modal = true;

pages/technology/setProcess/set.vue

@@ -25,19 +25,19 @@
       </Content>
     </Layout>
     <FooterToolbar extra v-if="footerBar">
-      <Row class="footer">
+      <div class="fr font_fff">
         <Checkbox @on-change="handleSelectAll(single)" v-model="single">全选</Checkbox>
         <span class="footerSpan">已选 {{selectCount}} 项</span>
         &nbsp;&nbsp;&nbsp;&nbsp;
         <Button type="primary" @click="modalDispatch">设置工艺</Button>
         <Button @click="canselFooter">取消</Button>
-      </Row>
+      </div>
     </FooterToolbar>
   </div>
 </template>
 <script>
 import Api from "./api";
-import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
+import ProductTree from "@/components/page/productTree.vue"; 
 export default {
   components: {
     ProductTree,
@@ -275,8 +275,14 @@ export default {
             orderIds: this.eid.orderIds,
             routingList: this.routingList,
           };
+
           Api.routingset(data).then((r) => {
-            this.$Message.success("工艺设置成功");
+            if (r.success) {
+              //this.$Message.success("工艺设置成功");
+              this.saveBill();
+            } else {
+              this.$Message.error("工艺设置失败");
+            }
           });
         },
         onCancel: () => {
@@ -284,6 +290,27 @@ export default {
         },
       });
     },
+    saveBill() {
+      //生成料单
+      let temRouId = [];
+      this.routingList.forEach((el) => {
+        temRouId.push(el.routingHeaderId);
+      });
+      let params = {
+        routingHeaderId: temRouId,
+        orderId: this.eid.orderIds,
+        orderCount: this.eid.count,
+      };
+      Api.createnew(params).then((res) => {
+        if (res.success) {
+          this.$emit("on-ok");
+          //this.loaddata(this.orderId);
+          //this.materialBillSetStatus = 1;
+        } else {
+          this.$Message.error("生成料单失败");
+        }
+      });
+    },
     l(key) {
       let vkey = "routingHeader" + "." + key;
       return this.$t(vkey) || key;
@@ -319,9 +346,9 @@ export default {
       margin-bottom: 10px;
     }
   }
-  .ivu-footer-toolbar-right {
-    margin-right: 72% !important;
-  }
+  //.ivu-footer-toolbar-right {
+   // margin-right: 72% !important;
+  //}
   .ivu-footer-toolbar {
     background: rgba(0, 0, 0, 0.7) !important;
     .footer {

src/assets/css/base.css

@@ -450,6 +450,10 @@ div::-webkit-scrollbar-corner {
 .d-button:active {
   transform: scale(0.96);
 }
+/*字体颜色*/
+.font_fff {
+  color: #fff;
+}
 /*按钮颜色*/
 .bluebg {
   background: #237bdf;
@@ -1118,3 +1122,7 @@ html [type=button] {
 .bgDDD {
   background: #DDD;
 }
+.ftball {
+  background: rgba(0, 0, 0, 0.7);
+  color: #fff;
+}