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

src/api/mes/md/itemtype.js

@@ -58,4 +58,14 @@ export function delItemType(itemTypeId) {
     url: '/mes/md/itemtype/' + itemTypeId,
     method: 'delete'
   })
-}
\ No newline at end of file
+}
+
+export function synItemType() {
+  return request({
+    url: '/mes/md/itemtype/sapSynchro',
+    method: 'post'
+  })
+}
+
+
+

src/views/mes/md/itemtype/index.vue

@@ -35,6 +35,16 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
+       <el-col :span="1.5">
+            <el-button
+              :loading="syncLoading"
+              type="primary"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handleSynchronism"
+              v-hasPermi="['mes:md:mditem:edit']"
+            >同步</el-button>
+          </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -149,7 +159,7 @@
 </template>
 
 <script>
-import { listItemType, getItemType, delItemType, addItemType, updateItemType, listItemTypeExcludeChild } from "@/api/mes/md/itemtype";
+import { listItemType, getItemType, delItemType, addItemType, updateItemType, listItemTypeExcludeChild ,synItemType} from "@/api/mes/md/itemtype";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -175,6 +185,8 @@ export default {
       isExpandAll: true,
       // 重新渲染表格状态
       refreshTable: true,
+
+      syncLoading: false,
       // 查询参数
       queryParams: {
         itemTypeName: undefined,
@@ -279,7 +291,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       getItemType(row.itemTypeId).then(response => {
-        this.form = response.data;
+        this.form = response.data; 
         this.open = true;
         this.title = "修改分类";
       });
@@ -287,6 +299,18 @@ export default {
         this.itemTypeOptions = this.handleTree(response.data, "itemTypeId","parentTypeId");
       });
     },
+    /** 同步SAP */
+    handleSynchronism() {
+      this.syncLoading = true;
+      this.reset();
+      synItemType().then(res => {
+        if(res.code === 200) {
+          this.$modal.msgSuccess("同步成功");
+         this.getList();
+        }
+        this.syncLoading = false;
+      });
+    },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {

src/views/mes/md/workstation/index.vue

@@ -463,9 +463,9 @@
         ref="machinerySelect"
         @onSelected="onMachineryAdd"
       ></MachinerySelectSingle> -->
-      <el-row v-if="form.workstationId != null">
-        <el-col :span="24">
-          <el-carousel trigger="click" type="card" :autoplay="false">
+      <div v-if="form.workstationId">
+        <!-- <el-col :span="24"> -->
+          <!-- <el-carousel trigger="click" type="card" :autoplay="false"> -->
             <!-- <el-carousel-item>
               <el-card shadow="always" style="width: 450px">
                 <div slot="header">
@@ -486,8 +486,8 @@
                 ></WorkStationMachine>
               </el-card>
             </el-carousel-item> -->
-            <el-carousel-item>
-              <el-card shadow="always" style="width: 400px">
+            <!-- <el-carousel-item> -->
+              <el-card shadow="always">
                 <div slot="header">
                   <span>人力资源</span>
                   <el-button
@@ -504,7 +504,7 @@
                   :workstationId="form.workstationId"
                 ></Workstationworker>
               </el-card>
-            </el-carousel-item>
+            <!-- </el-carousel-item> -->
             <!-- <el-carousel-item>
               <el-card shadow="always" style="width: 400px">
                 <div slot="header">
@@ -524,9 +524,9 @@
                 ></WorkStationTool>
               </el-card>
             </el-carousel-item> -->
-          </el-carousel>
-        </el-col>
-      </el-row>
+          <!-- </el-carousel> -->
+        <!-- </el-col> -->
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType == 'view'"
           >返回</el-button

src/views/mes/pro/arrange/info.vue

@@ -157,9 +157,9 @@
           <el-input-number v-model="form.arrangeSort" :min="0"
             label="序号"></el-input-number>
         </el-form-item>
-        <el-form-item label="生产工单号" prop="workorderId">
+        <!-- <el-form-item label="生产工单号" prop="workorderId">
           <el-input v-model="form.workorderId" placeholder="请输入生产工单号"/>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/mes/pro/packageLablePrint/index.vue

@@ -311,6 +311,9 @@ export default {
       this.handleQuery();
     },
     handleSave() {
+      if(!this.validSelect()) {
+         return
+      }
       updatePackagePrintRecord(this.tablePackageList).then((response) => {
         console.log(response, 'response')
         if (response.code === 200) {
@@ -319,6 +322,9 @@ export default {
       });
     },
     handleProduce() {
+      if(!this.validSelect()) {
+         return
+      }
       const params = {
         "checkBy": this.produceForm.checkBy,
         "inputBy": this.produceForm.inputBy,
@@ -336,6 +342,9 @@ export default {
       });
     },
     handleChooseTemplate() {
+      if (!this.validSelect()) {
+         return
+      }
       if (this.selectPackageTable.length === 0) {
         this.$message.warning('请至少选择一条数据')
         return
@@ -370,6 +379,13 @@ export default {
         }
       });
     },
+    validSelect() {
+      if (this.selectedItemId) {
+        return true
+      }
+      this.$message.warning('请选择生产工单')
+      return false
+    },
     handleCurrentChange(row) {
       console.log(row, 'row88')
       this.produceForm = Object.assign({},row)