whj 11 months ago
parent
commit
fec421563b

+ 0 - 4
src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -535,10 +535,6 @@ export default {
             status++
             this.$message.error('请填写' + item.spareName + '单价')
           }
-          if (!item.cdefine33) {
-            status++
-            this.$message.error('请填写' + item.spareName + '降本项目')
-          }
           item.funitprice = (+item.funitprice).toFixed(4)
           item.ipertaxrate = (+item.ipertaxrate).toFixed(2)
           item.fmoney = (+item.fmoney).toFixed(2)

+ 1 - 7
src/views/store/outstoreform/modules/BaseFormYY.vue

@@ -503,13 +503,7 @@ export default {
         }
         let status = 0
         values.outFlag = this.outFlag
-        values.detailList = this.data.map(item => {
-          if (!item.cdefine33) {
-            status++
-            this.$message.error('请填写' + item.spareName + '降本项目')
-          }
-          return item
-        })
+        values.detailList = this.data
         console.log(values)
         if (this.model != null) {
           values.pickId = this.model.id

+ 28 - 12
src/views/store/outstoreform/modules/DetailYY.vue

@@ -40,7 +40,7 @@
     </a-table>
 
     <history ref="history" :audit="false" :ok="handleCancel"></history>
-    </detail-list-item></a-card>
+  </a-card>
 </template>
 
 <script>
@@ -95,50 +95,66 @@ export default {
         },
         {
           title: '备件名称',
-          dataIndex: 'spareName'
+          dataIndex: 'spareName',
+          width: 150
+
         },
         {
           title: '编号',
-          dataIndex: 'no'
+          dataIndex: 'no',
+          width: 150
+
         },
         {
           title: '规格',
-          dataIndex: 'ggxh'
+          dataIndex: 'ggxh',
+          width: 150
+
         },
         {
           title: '单位',
-          dataIndex: 'unit'
+          dataIndex: 'unit',
+          width: 100
+
         },
         {
           title: '仓库',
-          dataIndex: 'storeName'
+          dataIndex: 'storeName',
+          width: 150
+
         },
         {
           title: '货架号',
-          dataIndex: 'storePosition'
+          dataIndex: 'storePosition',
+          width: 150
+
         },
         {
           title: '批次',
-          dataIndex: 'cbatch'
+          dataIndex: 'cbatch',
+          width: 150
+
         },
         {
           title: '降本项目',
           dataIndex: 'cdefine33',
-          width: 100
+          width: 150
         },
         {
           title: '申请数量',
           dataIndex: 'num',
-          width: 150
+          width: 120
         },
         {
           title: '实际数量',
           dataIndex: 'realNum',
-          width: 150
+          width: 120
         },
         {
           title: '备注',
-          dataIndex: 'remark'
+          dataIndex: 'remark',
+          width: 150
+
         },
         {
           title: '操作',