Commit b29ac7d0c2b7e5d13dca3d781d584c3f95d48e58

Authored by 陈翱
1 parent da8c34bc

完善缺料和领料信息

src/views/material/MaterialCollection.vue
... ... @@ -139,6 +139,15 @@
139 139  
140 140 <j-popup
141 141 v-show="showRentPrise"
  142 + ref="getPurchaseList"
  143 + code="getPurchaseList"
  144 + :param="purchaseParam"
  145 + org-fields="username"
  146 + dest-fields="popup"
  147 + field="popup"/>
  148 +
  149 + <j-popup
  150 + v-show="showRentPrise"
142 151 ref="shipment_details"
143 152 code="find_shipment_detail"
144 153 :param="shipmentParam"
... ... @@ -175,6 +184,7 @@ export default {
175 184 materialParam:{code:''},
176 185 shipmentParam:{code:'',moCode:''},
177 186 processParam:{no:'',workno:''},
  187 + purchaseParam:{no:'',workno:''},
178 188 inventoryParam:{code:''},
179 189 param1:{field0054:'',field0057:''},
180 190 description: '菜单管理页面',
... ... @@ -326,9 +336,10 @@ export default {
326 336 this.processParam['workno'] ="''"+data.workno+"''";
327 337 this.$refs.getPlanProcess.openModal();
328 338 }else{
329   -
  339 + this.purchaseParam['no'] = "'"+data.cno+"'";
  340 + this.purchaseParam['workno'] ="''"+data.workno+"''";
  341 + this.$refs.getPurchaseList.openModal();
330 342 }
331   -
332 343 },
333 344  
334 345 inventoryClick(data){
... ...
src/views/material/MissingMaterialsPlease.vue
... ... @@ -88,6 +88,11 @@
88 88 <span slot="receive" slot-scope="text, record">
89 89 <a @click="receiveClick(record)">{{ numFormat(record.llqty) }}</a>
90 90 </span>
  91 +
  92 + <span slot="openPlan" slot-scope="text, record">
  93 + <a @click="openPlan(record)">{{ record.plan }}</a>
  94 + </span>
  95 +
91 96 <span slot="inStock" slot-scope="text, record">
92 97 <a @click="inventoryClick(record)">{{ numFormat(record.qty) }}</a>
93 98 </span>
... ... @@ -118,6 +123,25 @@
118 123 org-fields="username"
119 124 dest-fields="popup"
120 125 field="popup"/>
  126 +
  127 + <j-popup
  128 + v-show="showRentPrise"
  129 + ref="getPlanProcess"
  130 + code="getPlanProcess"
  131 + :param="processParam"
  132 + org-fields="username"
  133 + dest-fields="popup"
  134 + field="popup"/>
  135 +
  136 + <j-popup
  137 + v-show="showRentPrise"
  138 + ref="getPurchaseList"
  139 + code="getPurchaseList"
  140 + :param="purchaseParam"
  141 + org-fields="username"
  142 + dest-fields="popup"
  143 + field="popup"/>
  144 +
121 145 <j-popup
122 146 v-show="showRentPrise"
123 147 ref="inventory_details"
... ... @@ -147,6 +171,8 @@ export default {
147 171 shipmentParam:{code:'',moCode:''},
148 172 inventoryParam:{code:''},
149 173 param1:{field0054:'',field0057:''},
  174 + processParam:{no:'',workno:''},
  175 + purchaseParam:{no:'',workno:''},
150 176 description: '菜单管理页面',
151 177 field0056:'',
152 178 field0054:'',
... ... @@ -207,7 +233,10 @@ export default {
207 233 {
208 234 title: '计划',
209 235 align: 'center',
210   - dataIndex: 'plan'
  236 + dataIndex: 'plan',
  237 + scopedSlots:{
  238 + customRender:'openPlan'
  239 + }
211 240 },
212 241 {
213 242 title: '领料',
... ... @@ -284,6 +313,20 @@ export default {
284 313 this.shipmentParam['moCode'] = "'"+data.workno+"'";
285 314 this.$refs.shipment_details.openModal();
286 315 },
  316 +
  317 + openPlan(data){
  318 + if(data.f04=='自制'){
  319 + this.processParam['no'] = "'"+data.cno+"'";
  320 + this.processParam['workno'] ="''"+data.workno+"''";
  321 + this.$refs.getPlanProcess.openModal();
  322 + }else{
  323 + this.purchaseParam['no'] = "'"+data.cno+"'";
  324 + this.purchaseParam['workno'] ="''"+data.workno+"''";
  325 + this.$refs.getPurchaseList.openModal();
  326 + }
  327 + },
  328 +
  329 +
287 330 inventoryClick(data){
288 331 this.inventoryParam['code'] = "'"+data.cno+"'";
289 332 this.$refs.inventory_details.openModal();
... ...