Merge remote-tracking branch 'origin/master'

src/views/warehouseBusiness/agreement/index.vue

@@ -456,13 +456,7 @@ export default {
       loading_s: false,
       browseStatus: false,
       // 计价单位
-      jFeetunitOptions: [
-        { dictLabel: '件数', dictValue: '1' },
-        { dictLabel: '毛重', dictValue: '2' },
-        { dictLabel: '净重', dictValue: '3' },
-        { dictLabel: '尺码', dictValue: '4' },
-        { dictLabel: '固定', dictValue: '5' }
-      ],
+      jFeetunitOptions: [],
       agreementId: 310,
       goodsOptions: [],
       fTypeidOptions: [],
@@ -558,9 +552,9 @@ export default {
     this.getDicts('data_goods_category').then(response => {
       this.fTypeidOptions = response.data
     })
-    // this.getDicts("data_unitfees").then(response => {
-    //   this.jFeetunitOptions = response.data;
-    // });
+    this.getDicts("data_unitfees").then(response => {
+      this.jFeetunitOptions = response.data;
+    });
     this.register()
   },
   activated(){

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -825,7 +825,7 @@
             <el-input
               v-model="scope.row.remark"
               placeholder="备注"
-              :disabled="browseStatus || scope.row.fBillstatus === 6"
+              :disabled="browseStatus"
               show-word-limit
             />
           </template>

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -1117,7 +1117,7 @@
             <el-input
               v-model="scope.row.remark"
               placeholder="备注"
-              :disabled="browseStatus || scope.row.fBillstatus === 40"
+              :disabled="browseStatus"
               show-word-limit
             />
           </template>