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

src/api/material.js

@@ -36,9 +36,9 @@ export function changeStaStatus(data) {
 
 // 修改物料表
 export function updateMaterial(data) {
-  const businessId = data.businessId
+  // const businessId = data.businessId
   return request({
-    url: '/nltifsmaterial/update/' + businessId,
+    url: '/nltifsmaterial/update',
     method: 'put',
     data,
     headers: {

src/api/model.js

@@ -9,3 +9,11 @@ export function listModel(query) {
     params: query
   })
 }
+
+// 删除
+export function deleteLogicalId(data) {
+  return request({
+    url: '/nltmodel/deleteLogical/' + data.businessId,
+    method: 'delete',
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       title: '诺兰特（北京）',
-      logo: require('@/assets/image/nltLogo.png')
+      logo: require('@/assets/image/leftLogo.png')
     }
   }
 }
@@ -58,10 +58,10 @@ export default {
 
     & .sidebar-logo {
       //margin-left: 55px;
-      width: 85px;
-      height: 50px;
+      //width: 85px;
+      //height: 50px;
       vertical-align: middle;
-      margin-right: 12px;
+      //margin-right: 12px;
     }
 
     & .sidebar-title {

src/layout/components/header.vue

@@ -152,7 +152,7 @@ export default {
   }
 
   .hamburger-container {
-    line-height: 6.3vh;
+    line-height: 4.5vh;
     height: 100%;
     float: left;
     cursor: pointer;

src/styles/element-ui.scss

@@ -229,15 +229,26 @@ body .el-table th.gutter{
     }
   }
 }
-
-
+// select框点击后红色边框
+.el-select .el-input.is-focus .el-input__inner{
+  border-color:#D20A10
+}
+// input框点击后红色边框
+.el-input__inner{
+  &:focus {
+    border-color:#D20A10
+  }
+}
+.vue-treeselect--open .vue-treeselect__control{
+  border-color:#D20A10!important;
+}
 // el-select 下拉框样式修改
 .el-select-dropdown {
   .el-select-dropdown__item {
-    color: #999999;
+    color: #333333;
     // 下拉框 hover时显示淡蓝色
     &:hover {
-      background-color: #ecf9fe !important;
+      background-color: #f3f3f3 !important;
     }
     &.selected {
       color: #333333;

src/styles/sidebar.scss

@@ -57,7 +57,7 @@
 
     .svg-icon {
       margin-top: 15px;
-      margin-left: 17px;
+      margin-left: 12px;
       margin-right: 17px;
       font-size: 20px;
     }
@@ -71,6 +71,7 @@
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
+      padding-left: 0px!important;
       &:hover {
         background-color: $menuHover !important;
         color: #FFFFFF!important;
@@ -215,6 +216,7 @@
 
 .el-submenu__icon-arrow {
   color: #ffffff !important;
+  right: 12px!important;
 }
 
 .is-active.submenu-title-noDropdown {

src/views/ProductionProcess/workOrder.vue

@@ -287,6 +287,13 @@
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              v-show="total1>0"
+              :total="total1"
+              :page.sync="rowsBom.page"
+              :limit.sync="rowsBom.rows"
+              @pagination="handleDetail"
+            />
           </el-tab-pane>
           <el-tab-pane label="工站信息">
             <el-table
@@ -424,6 +431,8 @@ export default {
       ],
       // 表格分页总数
       total: 0,
+      // 表格分页总数2
+      total1: 0,
       // 对话框打开标志
       open: false,
       // 对话框表单数据
@@ -433,7 +442,15 @@ export default {
       // 工站表格数据
       stationList: [],
       // 开工表格数据
-      lineList: []
+      lineList: [],
+      // 详情数据
+      rowsBom: {
+        // 表格页码标志
+        page: 1,
+        rows: 10,
+        orderNo: undefined,
+        contract: undefined
+      },
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -476,8 +493,19 @@ export default {
         this.form = response.data
         this.open = true
       })
-      listOrderMater({ bomId: row.bomId }).then(response => {
+      console.log(row)
+      let temp = JSON.parse(JSON.stringify(row.orderNo))
+      this.rowsBom.orderNo = temp
+      let temp1 = JSON.parse(JSON.stringify(row.contract))
+      this.rowsBom.contract = temp1
+      this.getBomTable()
+    },
+    /** 查询工单BOM数据 */
+    getBomTable() {
+      this.Loading1 = true
+      listOrderMater(this.rowsBom).then(response => {
         this.bomList = response.rows
+        this.total1 = response.total
         this.Loading1 = false
       })
     },

src/views/productionInfo/MaterialFile.vue

@@ -179,7 +179,7 @@
           <div slot="label" class="labelClass">
             <div class="labelName">软件版本号</div>
           </div>
-          <el-input style="width: 90%" :maxlength="50" v-model.trim="form.softwareVer" placeholder="请输入版本号" />
+          <el-input style="width: 90%" :maxlength="50" show-word-limit v-model.trim="form.softwareVer" placeholder="请输入版本号" />
         </el-form-item>
       </el-form>
       <div>配置SN规则</div>
@@ -199,7 +199,7 @@
                   <div slot="label" class="labelClass">
                     <div class="labelName">分组</div>
                   </div>
-                  <el-select v-model.trim="item.group" placeholder="请选择">
+                  <el-select v-model.trim="item.editGroup" placeholder="请选择">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -480,7 +480,7 @@ export default {
     },
     // 删除SN规则方法
     delSNRules(item, index) {
-      this.snRulesList.splice(index, 1)
+      this.form.nltMaterialEditList.splice(index, 1)
     },
     // 删除SN规则方法2
     delSNRule(item, index1) {
@@ -500,7 +500,6 @@ export default {
           }
         ]
       }
-      this.snRulesList = []
       this.resetForm('form','form1','form2')
     },
   }

src/views/productionInfo/ModelDetails.vue

@@ -455,7 +455,9 @@ export default {
       // 物料查询类型
       materQueryType: '',
       // 替换物料时 禁用自己的id判断
-      disabledId: ''
+      disabledId: '',
+      // 物料已被选中但是可编辑多选且提前查的id组 用于回显替换物料 状态1的时候传值
+      selectMaterIdStr: ''
     }
   },
   watch: {
@@ -592,6 +594,7 @@ export default {
       this.queryParams.materCode = ''
       this.queryParams.page = 1
       this.queryParams.rows = 10
+      this.selectMaterIdStr = ''
       this.openPartNo = true
       this.title = '选择成品料号'
       this.type = '3'
@@ -604,6 +607,7 @@ export default {
       this.queryParams.page = 1
       this.queryParams.rows = 10
       this.materQueryType = ''
+      this.selectMaterIdStr = ''
       if (row) {
         this.type = '1'
         this.materQueryType = (row.configureOrNot === null || row.configureOrNot === undefined || row.configureOrNot === '') ? '0' : '1'
@@ -621,6 +625,7 @@ export default {
         this.disabledId = row.businessId
         this.replaceMaterialList.forEach(item => {
           this.materIdList.push(item.businessId)
+          this.selectMaterIdStr += item.businessId
         })
       } else {
         this.materIdList = []
@@ -656,7 +661,8 @@ export default {
         ...this.queryParams,
         businessIdList: str,
         totalType: this.materQueryType,
-        type: ''
+        type: '',
+        selectMaterIdStr: this.selectMaterIdStr
       }
       if (this.type === '3') {
         params.type = '3'
@@ -1039,6 +1045,11 @@ export default {
       })
     },
     initData() {
+
+      for (let i = 0; i < this.positionList.length; i++) {
+        console.log(i)
+        this.positionList[i].sort = i
+      }
       const data = {
         materId: this.form.materId,
         modelType: this.form.modelType,

src/views/productionInfo/ProductionModel.vue

@@ -157,7 +157,7 @@
 </template>
 
 <script>
-import { listModel } from '@/api/model'
+import { listModel, deleteLogicalId } from '@/api/model'
 
 export default {
   name: 'ProductionModel',
@@ -224,6 +224,23 @@ export default {
         }
       })
     },
+    // 删除生产模型
+    handleDelete(row) {
+      this.$confirm('确定删除该生产模型?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteLogicalId({ businessId: row.businessId }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.handleQuery()
+        })
+      }).catch(() => {
+      })
+    },
     // 详情
     handleQueryInfo(row) {
       this.$router.push({

src/views/productionInfo/Station.vue

@@ -161,7 +161,7 @@
                 <div class="labelName">工站编号</div>
                 <div class="labelName">Position No</div>
               </div>
-              <el-input :maxlength="50" v-model.trim="form.staCode" placeholder="请输入工站编号" />
+              <el-input :maxlength="50" show-word-limit v-model.trim="form.staCode" placeholder="请输入工站编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -170,7 +170,7 @@
                 <div class="labelName">工站名称</div>
                 <div class="labelName">Position Name</div>
               </div>
-              <el-input :maxlength="100" v-model.trim="form.staName" placeholder="请输入工站名称" />
+              <el-input :maxlength="100" show-word-limit v-model.trim="form.staName" placeholder="请输入工站名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -207,7 +207,7 @@
                 <div class="labelName">工站简称</div>
                 <div class="labelName">Position Abbr</div>
               </div>
-              <el-input v-model.trim="form.staAbbreviation" :maxlength="50" placeholder="请输入工站简称" />
+              <el-input v-model.trim="form.staAbbreviation" :maxlength="50" show-word-limit placeholder="请输入工站简称" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -216,7 +216,7 @@
                 <div class="labelName">备注</div>
                 <div class="labelName">PS</div>
               </div>
-              <el-input v-model.trim="form.remarks" :maxlength="256" type="textarea" :row="3" placeholder="请输入备注" />
+              <el-input v-model.trim="form.remarks" :maxlength="256" show-word-limit type="textarea" :row="3" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/system/device/index.vue

@@ -178,7 +178,7 @@
                 <div class="labelName">设备名称</div>
                 <div class="labelName">Equipment Name</div>
               </div>
-              <el-input :maxlength="100" v-model.trim="form.deviceName" placeholder="请输入设备名称" />
+              <el-input :maxlength="100" show-word-limit v-model.trim="form.deviceName" placeholder="请输入设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -203,7 +203,7 @@
                 <div class="labelName">设备编号</div>
                 <div class="labelName">Equipment Number</div>
               </div>
-              <el-input :maxlength="100" v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
+              <el-input :maxlength="100" show-word-limit v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/system/user/index.vue

@@ -472,6 +472,7 @@
                 <div class="labelName">Dept</div>
               </div>
               <treeSelect
+                class="userTree"
                 v-model="form.deptId"
                 :disable-branch-nodes="false"
                 :default-expand-level="1"

vue.config.js

@@ -70,7 +70,7 @@ module.exports = {
       //   }
       // },
       // [process.env.VUE_APP_INTERNAL]: {
-      //   target: 'http://zt.91isoft.com:10184/internal/',
+      //   target: 'http://zt.91isoft.com:10184/internal/'
       //   // target: 'http://192.168.1.17:10010/internal/',
       //   // target: 'http://10.5.87.231:10010/internal/',
       //   changeOrigin: true,