Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev

src/views/mes/qms/inspec/index.vue

@@ -157,7 +157,9 @@
 									<el-dropdown-item command="edit" :disabled="scope.row.status !== '1'"
 										>{{ $t('common.edit') }}
 									</el-dropdown-item>
-                  <el-dropdown-item command="process"
+                  <el-dropdown-item
+                    command="process"
+                    v-if="qms_insp_job_process"
                     :disabled="scope.row.status !== '1' && scope.row.status !== '2'">
                     执行
                   </el-dropdown-item>
@@ -417,6 +419,7 @@ export default {
 		this.qms_insp_job_complete = this.permissions['qms_insp_job_complete']
 		this.qms_insp_job_judge = this.permissions['qms_insp_job_judge']
 		this.qms_insp_job_close = this.permissions['qms_insp_job_close']
+    this.qms_insp_job_process = this.permissions['qms_insp_job_process']
     //获取作业规则
     let activityId = this.$route.query.ACTIVITY_ID
     this.initList(activityId)

src/views/mes/wip/resource-feeding/index.vue

@@ -182,7 +182,10 @@
       }
     },
     created() {
+      let me = this
       this.formObj = copyJSON(this.initData)
+      me.formObj.operation = me.$route.query.operation
+      me.formObj.resource = me.$route.query.resrce
       let activityId = this.$route.query.ACTIVITY_ID
       showLoading()
       listByActivityId(activityId)

src/views/mes/wms-nalinv/poRegister/index.vue

@@ -126,7 +126,7 @@
               </el-table-column>
               <el-table-column prop="bseg" width="60" fixed="left" label="序号"></el-table-column>
               <el-table-column prop="item" label="物料"></el-table-column>
-              <el-table-column prop="itemDesc" label="物料名称"></el-table-column>
+              <el-table-column prop="itemDesc" label="物料名称" width="120" show-overflow-tooltip></el-table-column>
               <el-table-column prop="batch" label="供应商批次" width="110">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.supplierBatch" clearable></el-input>

vue.config.js

@@ -2,8 +2,8 @@
  * 配置参考:
  * https://cli.vuejs.org/zh/config/
  */
-const url = 'http://mom-gateway:9999'
-// const url = 'http://192.168.100.8:11001'
+// const url = 'http://mom-gateway:9999'
+const url = 'http://192.168.100.8:11001'
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 const path = require('path')