meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qw

Browse Source
This commit is contained in:
caoxinyu
2019-09-24 10:13:36 +08:00
parent 2a90014ac1
commit 3b9805e47d
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/request.js
View File

@@ -23,11 +23,8 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
<<<<<<< HEAD
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
=======
baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
>>>>>>> f8c7e9afc36e00f5106add1477d9f258dbe37ec6
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

2
src/views/Inventory/MaterialOut/index.vue
View File

@@ -55,7 +55,7 @@
<h4>领料单明细：{{ pickingListNumberShow }}</h4> <h4>领料单明细：{{ pickingListNumberShow }}</h4>
</el-col> </el-col>
<el-col style="float:left;width: 200px;margin-top:15px"> <el-col style="float:left;width: 200px;margin-top:15px">
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button> <el-button :disabled="multipleSelection.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button> <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
</el-col> </el-col>
</el-row> </el-row>

2
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -464,7 +464,7 @@ export default {
if (this.count1 !== 1) { if (this.count1 !== 1) {
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
} }
this.title1 = '新增'+this.personnelNumber+'修补工时' this.title1 = '新增' + this.personnelNumber + '修补工时'
this.dialogFormVisible = true this.dialogFormVisible = true
} }
}, },

6
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -162,7 +162,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-tooltip content="一键删除交货期" placement="right"> <el-tooltip content="一键删除交货期" placement="right" open-delay="1000">
<el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/> <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
</el-tooltip> </el-tooltip>
<span>①选择合同模板：</span> <span>①选择合同模板：</span>
@@ -176,7 +176,9 @@
<!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>--> <!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
<!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>--> <!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
<span>②递交审批：</span> <span>②递交审批：</span>
<el-button type="success" size="small" @click="generateContract()">递交</el-button> <el-tooltip effect="dark" content="核对信息后生成合同" placement="top" open-delay="1000">
<el-button type="success" size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr> <hr>
<!--html代码--> <!--html代码-->
<div v-show="false">{{ content }}</div> <div v-show="false">{{ content }}</div>