| src/views/jcsz/jsqd.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/scgl/gd.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/scgl/scdd.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/zzmx/chda.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/jcsz/jsqd.vue
@@ -560,6 +560,7 @@ </div> <div class="myCheckboxGroup"> <div v-for="item in dialogFormRight.rightOperationArr" :key="item.code" @@ -567,7 +568,6 @@ class="myCheckbox" @click="myCheckboxClick(item)" > <!-- <input--> <!-- class="myCheckboxInput"--> <!-- type="checkbox"--> @@ -1387,15 +1387,16 @@ name: this.dialogFormRight.rightPCArr[0].name }) } if (this.APPTrue) { this.dialogFormRight.rightOperationArr.push({ isSelected1: appIsSelected1, isSelected2: appIsSelected2, code: this.dialogFormRight.rightAPPArr[0].code, flag: rightAPPArrFlag, name: this.dialogFormRight.rightAPPArr[0].name }) } //莱科和福莱特的注释掉 // if (this.APPTrue) { // this.dialogFormRight.rightOperationArr.push({ // isSelected1: appIsSelected1, // isSelected2: appIsSelected2, // code: this.dialogFormRight.rightAPPArr[0].code, // flag: rightAPPArrFlag, // name: this.dialogFormRight.rightAPPArr[0].name // }) // } if (this.PCTrue) { this.dialogFormRight.rightPCArr[0].name = '全部' if (this.rightFrom.usercode === 'S001') { // Admin系统管理员菜单做到只增不减 src/views/scgl/gd.vue
@@ -620,29 +620,29 @@ </el-select> </el-form-item> </div> <el-form-item label="是否排程" prop="isAps"> <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps"> <el-radio key="Y" label="Y" value="Y">是</el-radio> <el-radio key="N" label="N" value="N">否</el-radio> </el-radio-group> </el-form-item> <el-form-item label="物料清单" :prop="dialogForm.isAps==='Y'?'bomId':''"> <el-select v-model="dialogForm.bomId" filterable :disabled="dialogForm.isAps==='N'" :popper-append-to-body="false" style="width: 200px;" placeholder="请选择" > <el-option v-for="item in bomIdArr" :key="item.id" :label="item.version" :value="item.id" /> </el-select> </el-form-item> <!-- <el-form-item label="是否排程" prop="isAps">--> <!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">--> <!-- <el-radio key="Y" label="Y" value="Y">是</el-radio>--> <!-- <el-radio key="N" label="N" value="N">否</el-radio>--> <!-- </el-radio-group>--> <!-- </el-form-item>--> <!-- <el-form-item label="物料清单" :prop="dialogForm.isAps==='Y'?'bomId':''">--> <!-- <el-select--> <!-- v-model="dialogForm.bomId"--> <!-- filterable--> <!-- :disabled="dialogForm.isAps==='N'"--> <!-- :popper-append-to-body="false"--> <!-- style="width: 200px;"--> <!-- placeholder="请选择"--> <!-- >--> <!-- <el-option--> <!-- v-for="item in bomIdArr"--> <!-- :key="item.id"--> <!-- :label="item.version"--> <!-- :value="item.id"--> <!-- />--> <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="计划开始时间" prop="planstartdate"> <el-date-picker v-model="dialogForm.planstartdate" src/views/scgl/scdd.vue
@@ -272,18 +272,18 @@ <div v-else>/</div> </template> </el-table-column> <el-table-column prop="saleOrderDeliveryDate" label="预计交付日期" sortable="custom" show-tooltip-when-overflow width="130" > <template slot-scope="{row}"> <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div> <div v-else>/</div> </template> </el-table-column> <!-- <el-table-column--> <!-- prop="saleOrderDeliveryDate"--> <!-- label="预计交付日期"--> <!-- sortable="custom"--> <!-- show-tooltip-when-overflow--> <!-- width="130"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column show-tooltip-when-overflow prop="createuser" @@ -412,19 +412,19 @@ style="width: 200px" /> </el-form-item> <el-form-item label="预计交付日期" prop="saleOrderDeliveryDate"> <el-date-picker v-model="dialogForm.saleOrderDeliveryDate" type="date" size="mini" :clearable="false" class="dateMini" :picker-options="pickerOptions" format="yyyy-MM-dd" placeholder="选择日期" :disabled="dialogForm.saleOrderDeliveryDateIsDisabled" /> </el-form-item> <!-- <el-form-item label="预计交付日期" prop="saleOrderDeliveryDate">--> <!-- <el-date-picker--> <!-- v-model="dialogForm.saleOrderDeliveryDate"--> <!-- type="date"--> <!-- size="mini"--> <!-- :clearable="false"--> <!-- class="dateMini"--> <!-- :picker-options="pickerOptions"--> <!-- format="yyyy-MM-dd"--> <!-- placeholder="选择日期"--> <!-- :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"--> <!-- />--> <!-- </el-form-item>--> </el-form> <span slot="footer" class="dialog-footer"> @@ -446,7 +446,7 @@ <script> import Pagination from '@/components/Pagination' import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl' import { handleDatetime } from '@/utils/global' import { handleDatetime, handleDatetime2 } from '@/utils/global' import { SeaveSearchErpOrder } from '@/api/ErpSyncMes' import elDragDialog from '@/directive/el-drag-dialog' import waves from '@/directive/waves' @@ -519,7 +519,7 @@ markqty: '', // 下单数量 ordernum: '', // 下单单数 relse_qty: '', // 已下单数量 saleOrderDeliveryDate: '', // 预计交付日期 saleOrderDeliveryDate: handleDatetime2(new Date()), // 预计交付日期 saleOrderDeliveryDateIsDisabled: false// 预计交付日期字段是否可修改 }, @@ -739,7 +739,7 @@ this.dialogForm.warehousecode = '' this.dialogForm.warehousename = '' this.dialogForm.saleOrderDeliveryDate = '' this.dialogForm.saleOrderDeliveryDate = handleDatetime2(new Date()) this.dialogForm.erpqty = '' this.dialogForm.markqty = '' src/views/zzmx/chda.vue
@@ -416,7 +416,7 @@ </el-form-item> </el-form> <el-collapse> <el-collapse v-if="false"> <el-collapse-item title="一致性 Consistency" name="1"> <template slot="title"> <div> vue.config.js
@@ -52,8 +52,8 @@ }, proxy: { [process.env.VUE_APP_BASE_API]: { // target: 'http://121.196.36.24:8001', // 请求的第三⽅接⼝地址 本地开发服务器 target: 'http://192.168.1.102:8001', // 请求的第三⽅接⼝地址 莱科 target: 'http://121.196.36.24:8011', // 请求的第三⽅接⼝地址 本地开发服务器 // target: 'http://192.168.1.102:8001', // 请求的第三⽅接⼝地址 莱科 changeOrigin: true, // 请求跨域时，需 配置此项 pathRewrite: { // 路径重写,替换target中的请求地址
