Merge remote-tracking branch 'origin/demo_' into demo_

src/views/idle-assets/modules/AuditForm.vue

@@ -20,7 +20,7 @@
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
-            <a-radio-group v-decorator="['status', {initialValue: status, rules: [{required: true, message: '审核人不能为空'}]}]">
+            <a-radio-group @change="changeOpinion" v-decorator="['status', {initialValue: status, rules: [{required: true, message: '审核人不能为空'}]}]">
               <a-radio-button :value="status">
                 通过
               </a-radio-button>
@@ -38,7 +38,8 @@
           >
             <a-textarea
               :rows="4"
-              v-decorator="['advice']"/>
+              v-model="advice"
+            />
           </a-form-item>
         </row-item>
       </row-list>
@@ -62,6 +63,7 @@ export default {
       form: this.$form.createForm(this),
       visible: false,
       status: 0,
+      advice: '同意',
       // 下拉框map
       model: null
     }
@@ -88,6 +90,10 @@ export default {
         ])))
       })
     },
+    changeOpinion (e) {
+      const val = e.target.value
+      this.advice = val === this.status ? '同意' : '拒绝'
+    },
     save () {
       const { form: { validateFieldsAndScroll } } = this
       this.confirmLoading = true
@@ -97,6 +103,7 @@ export default {
           return
         }
         // 日期处理
+        values.advice = this.advice
         checkSbUnused(values)
           .then(() => {
             this.handleCancel(values)
@@ -110,6 +117,7 @@ export default {
       this.confirmLoading = false
       this.status = 0
       this.model = null
+      this.advice = '同意'
       this.form.resetFields()
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok')

src/views/idle-assets/modules/Detail.vue

@@ -24,7 +24,7 @@
       <a-step v-for="item in modal.sbUnusedVerifyRecordVOS" :key="item.id" :title="item.realName" :sub-title="item.createdTime+' '+item.statusStr" :description="item.advice" />
     </a-steps>
     <div class="btn">
-      <a-button type="primary" v-show="modal.status===1||modal===2" @click="handleAudit">审核</a-button>&nbsp;
+      <a-button type="primary" v-show="modal.status===1||modal.status===2" @click="handleAudit">审核</a-button>&nbsp;
       <a-button @click="handleCancel">返回</a-button>
     </div>
     <AuditForm ref="auditForm" @ok="handleOk"/>
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import { getUnusedInfo } from '@/api/idle-assets/idle-assets'
 import AuditForm from './AuditForm.vue'
 import DetailList from '@/components/tools/DetailList'
 const DetailListItem = DetailList.Item
@@ -90,7 +91,9 @@ export default {
     },
     handleOk () {
       this.visible = true
-      this.$refs.table.refresh()
+      getUnusedInfo({ id: this.modal.id }).then(res => {
+        this.modal = res.data
+      })
     },
     handleCancel () {
       this.visible = false

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -485,7 +485,7 @@ export default {
           }
         }
         if (!find) {
-          const selectData = rows[i]
+          const selectData = this.BaseTool.Object.copy(rows[i])
           selectData.storeNum = selectData.num
           selectData.num = 1
           data.push(selectData)

src/views/store/outstoreform/modules/BaseFormYY2.vue

@@ -663,6 +663,7 @@ export default {
           selectData.storeNum = selectData.num
           selectData.spareNo = selectData.no
           selectData.num = 1
+          selectData.addBom = this.type2 === 2
           data.push(selectData)
         }
       }

src/views/store/outstoreform/modules/TicketForm.vue

@@ -23,7 +23,7 @@
             <td colspan="1" style="text-align:left;">
               {{ type? '领库':'退库' }}单位或个人：{{ model.createdUserName }}
             </td>
-            <td colspan="3" style="text-align:left;">
+            <td colspan="4" style="text-align:left;">
               项目：{{ model.projectName }}
             </td>
             <td colspan="3" style="text-align:left;">
@@ -31,7 +31,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="7" style="text-align:left;">
+            <td colspan="8" style="text-align:left;">
               用途：{{ model.remark }}
             </td>
           </tr>
@@ -42,6 +42,7 @@
             <td colspan="1" style="min-width:65px;">货架号</td>
             <td colspan="1" style="min-width:50px;">单位</td>
             <td colspan="1" style="min-width:50px;">数量</td>
+            <td colspan="1" style="min-width:50px;">仓库名称</td>
             <td colspan="1" style="min-width:50px;">备注</td>
           </tr>
           <tr v-for="item in model.detailList" :key="item.id">
@@ -51,6 +52,7 @@
             <td colspan="1">{{ item.storePosition }}</td>
             <td colspan="1">{{ item.unit }}</td>
             <td colspan="1">{{ item.num }}</td>
+            <td colspan="1">{{ item.storeName }}</td>
             <td colspan="1">{{ item.remark }}</td>
           </tr>
           <tr v-show="model.detailList.length<6" v-for="i in ((6-model.detailList.length)>0?(6-model.detailList.length):0)" :key="i">
@@ -68,6 +70,7 @@
             <td colspan="1"></td>
             <td colspan="1">{{ model.detailList.reduce((num,item)=>num+=item.num,0) }}</td>
             <td colspan="1"></td>
+            <td colspan="1"></td>
           </tr>
         </table>
       </div>