Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

src/views/purchaseIssue/index.vue

@@ -772,6 +772,7 @@ export default {
   },
   methods: {
     toChies(amount) { //形参
+      this.chineseStr = 0
       // 汉字的数字
       const cnNums = ["零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"];
       // 基本单位
@@ -858,7 +859,6 @@ export default {
       } else if (decimalNum === "") {
         chineseStr += cnInteger;
       }
-      // console.log(chineseStr)
       this.chineseStr = chineseStr
       // return chineseStr;
     },
@@ -984,6 +984,7 @@ export default {
             this.$set(this.purchaseList,'columnList',this.$options.data().contentStyle)
             this.setRowList = this.$options.data().contentStyle
           }
+          this.purchaseList.columnList.forEach(item => item.disabled = true)
           this.pageDisplay = false
           this.isItHidden = false
           this.inDex = this.contentOption.length
@@ -1093,14 +1094,8 @@ export default {
           }
           this.$refs.avatar.form = {}
           this.getRow(data, list)
-          //   for(let li in this.contentButton){
-          //     if(this.contentButton[li].name == '返回列表' || this.contentButton[li].name == '修改' ||this.contentButton[li].name == '申请发票' || this.contentButton[li].name == '查看审批'){
-          //       this.contentButton[li].disabled = false
-          //     }else {
-          //       this.contentButton[li].disabled = true
-          //     }
-          // }
         }
+        console.log(this.contentStyle)
       })
     },
     //请核
@@ -1276,6 +1271,7 @@ export default {
               }
             } else {
               item.disabled = false
+              this.purchaseList.columnList.forEach(item => item.disabled = false)
               this.contentStyle.forEach(item => item.disabled = false)
               this.contentOption.forEach(item => {
                 if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'fBillno') {

src/views/purchaseRequest/index.vue

@@ -900,6 +900,7 @@ export default {
     },
     //查询列数据
     getRow(data,list) {
+      console.log(data,list)
       select(data).then((res) => {
         if (data.tableName === '采购申请详情') {
           if (res.data.length != 0) {
@@ -912,6 +913,7 @@ export default {
             this.$set(this.purchaseList,'columnList',this.$options.data().contentStyle)
             this.setRowList = this.$options.data().contentStyle
           }
+          this.purchaseList.columnList.forEach(item => item.disabled = true)
           this.pageDisplay = false
           this.isItHidden = false
           this.inDex = this.contentOption.length
@@ -967,9 +969,9 @@ export default {
     },
     //查看
     viewMethod(scope) {
-      console.log(scope)
       this.contentOption.forEach(item => item.disabled = true)
       this.contentStyle.forEach(item => item.disabled = true)
+      console.log(this.contentStyle)
       this.contentButton.forEach(item =>{
         if (item.name == '返回列表' || item.name == '修改'){
           item.disabled = false
@@ -989,7 +991,6 @@ export default {
           }
           this.$refs.avatar.form = {}
           this.getRow(data,list)
-
         }
       })
     },
@@ -1142,6 +1143,7 @@ export default {
               }
             }else {
               item.disabled = false
+              this.purchaseList.columnList.forEach(item => item.disabled = false)
               this.contentStyle.forEach(item => item.disabled = false)
               this.contentOption.forEach(item => {
                 if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {