Merge branch 'dev' of xiongzhu/raex_front into master

src/views/asset/Detail.vue

@@ -918,7 +918,11 @@ export default {
             }
             getHolds()
                 .then(() => {
-                    if (holdDays === 0 && _this.info.source === 'OFFICIAL') {
+                    console.log(_this.info.type === 'PICTURE');
+                    if (
+                        (_this.info.holdDays === 0 || _this.info.holdDays === '0') &&
+                        _this.info.source === 'OFFICIAL'
+                    ) {
                         return _this.$http.get('/sysConfig/get/OFFICIAL_CONSIGNMENT').then(res => {
                             holdDays = Number(res.value);
                             return Promise.resolve();
@@ -952,6 +956,12 @@ export default {
                                 });
                             }
                         });
+                    } else if (_this.info.type === 'PICTURE') {
+                        console.log('3746');
+                        return _this.$http.get('/sysConfig/get/picture_hold_days').then(res => {
+                            holdDays = Number(res.value);
+                            return Promise.resolve();
+                        });
                     } else {
                         return Promise.resolve();
                     }