Browse Source

技能博物馆-转移申请

jbb 2 years ago
parent
commit
5cd432a287
2 changed files with 18 additions and 16 deletions
  1. 10 10
      src/views/activiti/form/demoForm2.vue
  2. 8 6
      src/views/activiti/form/fixedZyModal.vue

+ 10 - 10
src/views/activiti/form/demoForm2.vue

@@ -805,16 +805,16 @@ export default {
               })
         }
 
-        // 技能博物馆---物料库存--金额计算
-        if((key == 'unit_price'||key=='amount') && this.processData.businessTable == 'material_apply'){
-            var that = this
-            setTimeout(function(){
-                    var unit_price = that.$refs.KFB.form.getFieldValue('unit_price'),
-                     amount = that.$refs.KFB.form.getFieldValue('amount'),
-                     sum = Number(unit_price)*Number(amount)
-                     that.$refs.KFB.setData({money:sum}) 
-                },0)    
-        }
+        // // 技能博物馆---物料库存--金额计算
+        // if((key == 'unit_price'||key=='amount') && this.processData.businessTable == 'material_apply'){
+        //     var that = this
+        //     setTimeout(function(){
+        //             var unit_price = that.$refs.KFB.form.getFieldValue('unit_price'),
+        //              amount = that.$refs.KFB.form.getFieldValue('amount'),
+        //              sum = Number(unit_price)*Number(amount)
+        //              that.$refs.KFB.setData({money:sum}) 
+        //         },0)    
+        // }
 
          // 技能博物馆---物料库存--部门
         if(key == 'input_account' && this.processData.businessTable == 'material_apply'){

+ 8 - 6
src/views/activiti/form/fixedZyModal.vue

@@ -161,16 +161,17 @@ export default {
           width: 90,
           className: 'replacecolor',
         },
-        {
-          title: '采购人',
-          dataIndex: 'acceptPersonnel: ',
-          width: 90,
-          className: 'replacecolor',
-        },
+        // {
+        //   title: '采购人',
+        //   dataIndex: 'acceptPersonnel: ',
+        //   width: 90,
+        //   className: 'replacecolor',
+        // },
         {
           title: '其他说明',
           dataIndex: 'otherDescription',
           width: 90,
+          ellipsis: true,
           className: 'replacecolor',
         },
         {
@@ -236,6 +237,7 @@ export default {
             asset_name:this.selectedRows[0].assetName,
             specifications_models:this.selectedRows[0].specificationsModels,
             acquisition_date:this.selectedRows[0].acquisitionDate,
+            original_value:this.selectedRows[0].unitPrice,
            }
           }else if(this.sat == '归还'){
             var data ={