LLJ20200424V1

src/utils/request.js

@@ -28,6 +28,7 @@ export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ash
 export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
 const service = axios.create({
   baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+  // baseURL: `http://192.168.1.188:8045/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -1056,7 +1056,6 @@ export default {
       this.$refs['form2'].validate((valid) => {
         if (valid) {
           this.AddTableData_disable = true
-
           submitTable(this.form2.工序, this.form2.质检类型, this.form2.检测数, this.form2.质检情况, this.id, this.form2.不合格数量, this.form2.不合格原因, this.form2.不合格处理, this.form2.备注, this.form2.操作工, this.$store.state.user.id).then(response => {
             if (response.data[0].result === '1') {
               this.dialogFormVisible10 = false

src/views/Inventory/MaterialOut/index.vue

@@ -6,7 +6,7 @@
           <span slot="label">领料单</span>
           <div style="margin-top: 2px;margin-bottom: 2px">
             <!--<span style="margin: 5px">领料单编号:</span>-->
-            <el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
+            <el-input v-model="pickingListNumber" placeholder="领料单编号/领料人/机床号" clearable size="small" style="width:200px" />
             <span style="margin: 5px">创建时间:</span>
             <el-date-picker
               v-model="dateRange"
@@ -35,7 +35,7 @@
                     {{ scope.row.姓名 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="140px">
+                <el-table-column label="机床" prop="备注" show-overflow-tooltip align="center" min-width="140px">
                   <template slot-scope="scope">
                     {{ scope.row.领料单备注 }}
                   </template>