正在显示
3 个修改的文件
包含
17 行增加
和
9 行删除
| @@ -78,8 +78,8 @@ | @@ -78,8 +78,8 @@ | ||
| 78 | <a v-if="text" @click="handleViewProductionPlan(record)" >{{ text }}</a> | 78 | <a v-if="text" @click="handleViewProductionPlan(record)" >{{ text }}</a> |
| 79 | </template> | 79 | </template> |
| 80 | <span slot="action" slot-scope="text, record"> | 80 | <span slot="action" slot-scope="text, record"> |
| 81 | - <div v-if="record.assignDesignStatus === '0'"> | ||
| 82 | - <a @click="handleAssignDesign(record)" >派任务</a> | 81 | + <div> |
| 82 | + <a @click="handleViewOrders(record)" >查看</a> | ||
| 83 | <a-divider type="vertical" /> | 83 | <a-divider type="vertical" /> |
| 84 | <a @click="handleEdit(record)" >编辑</a> | 84 | <a @click="handleEdit(record)" >编辑</a> |
| 85 | <a-divider type="vertical" /> | 85 | <a-divider type="vertical" /> |
| @@ -87,9 +87,9 @@ | @@ -87,9 +87,9 @@ | ||
| 87 | <a>删除</a> | 87 | <a>删除</a> |
| 88 | </a-popconfirm> | 88 | </a-popconfirm> |
| 89 | </div> | 89 | </div> |
| 90 | - <div v-else> | 90 | + <!-- <div v-else> |
| 91 | <a @click="handleViewOrders(record)" >查看</a> | 91 | <a @click="handleViewOrders(record)" >查看</a> |
| 92 | - </div> | 92 | + </div> --> |
| 93 | </span> | 93 | </span> |
| 94 | 94 | ||
| 95 | </a-table> | 95 | </a-table> |
| @@ -49,6 +49,12 @@ | @@ -49,6 +49,12 @@ | ||
| 49 | </a-form-model-item> | 49 | </a-form-model-item> |
| 50 | </a-col> --> | 50 | </a-col> --> |
| 51 | <a-col :span="24"> | 51 | <a-col :span="24"> |
| 52 | + <a-form-model-item label="派工日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispatchDate"> | ||
| 53 | + <j-date placeholder="请选择派工日期" v-model="model.dispatchDate" style="width: 100%" | ||
| 54 | + :disabled-date="disabledEndDate"/> | ||
| 55 | + </a-form-model-item> | ||
| 56 | + </a-col> | ||
| 57 | + <a-col :span="24"> | ||
| 52 | <a-form-model-item label="交货日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryDate"> | 58 | <a-form-model-item label="交货日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryDate"> |
| 53 | <j-date placeholder="请选择交货日期" v-model="model.deliveryDate" style="width: 100%" | 59 | <j-date placeholder="请选择交货日期" v-model="model.deliveryDate" style="width: 100%" |
| 54 | :disabled-date="disabledEndDate" /> | 60 | :disabled-date="disabledEndDate" /> |
| @@ -125,7 +131,9 @@ export default { | @@ -125,7 +131,9 @@ export default { | ||
| 125 | quantity: [ | 131 | quantity: [ |
| 126 | { required: true, message: '请输入数量!' }, | 132 | { required: true, message: '请输入数量!' }, |
| 127 | ], | 133 | ], |
| 128 | - | 134 | + dispatchDate: [ |
| 135 | + { required: true, message: '请输入派工日期!' }, | ||
| 136 | + ], | ||
| 129 | deliveryDate: [ | 137 | deliveryDate: [ |
| 130 | { required: true, message: '请输入交货日期!' }, | 138 | { required: true, message: '请输入交货日期!' }, |
| 131 | ], | 139 | ], |
| @@ -249,10 +249,10 @@ export default { | @@ -249,10 +249,10 @@ export default { | ||
| 249 | // 触发表单验证 | 249 | // 触发表单验证 |
| 250 | this.$refs.form.validate(valid => { | 250 | this.$refs.form.validate(valid => { |
| 251 | if (valid) { | 251 | if (valid) { |
| 252 | - if(!this.model.designPic && !this.model.designFile){ | ||
| 253 | - this.$message.warning("请上传生产图或生产图文件!") | ||
| 254 | - return | ||
| 255 | - } | 252 | + // if(!this.model.designPic && !this.model.designFile){ |
| 253 | + // this.$message.warning("请上传生产图或生产图文件!") | ||
| 254 | + // return | ||
| 255 | + // } | ||
| 256 | if(this.dataSource.length==0){ | 256 | if(this.dataSource.length==0){ |
| 257 | this.$message.warning("请新增材料及外购件!") | 257 | this.$message.warning("请新增材料及外购件!") |
| 258 | return | 258 | return |
-
请 注册 或 登录 后发表评论