Merge branch 'branch_ccpg_220107' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG into branch_ccpg_220107

# Conflicts:
#	vue/src/router/modules/hq_menu.js

vue/src/router/modules/vw_menu.js

@@ -30,7 +30,7 @@ const vwMenudataRouter = {
                     name: 'Invoices',
                     meta: {
                         title: '发票汇总',
-                        roles: ['SettleAccount.Invoices'],
+                        roles: ['SettleAccount.Reports'],
                         icon: '对比'
                     }
                 },

vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

@@ -93,6 +93,20 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+       <el-table-column
+        prop="OutPutQty"
+        label="出库数量"
+        width="100">
+         <template slot-scope="scope">
+      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+    </template>
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        :formatter="fieldFormatter"
+        label="状态"
+        width="100">
+      </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -295,7 +309,7 @@ export default {
       //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
       tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
       return tempsTabs;
     },

vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

@@ -93,6 +93,20 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+      <el-table-column
+        prop="OutPutQty"
+        label="出库数量"
+        width="100">
+         <template slot-scope="scope">
+      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+    </template>
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        :formatter="fieldFormatter"
+        label="状态"
+        width="100">
+      </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -293,7 +307,7 @@ export default {
       //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
       tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
       return tempsTabs;
     },

vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue

@@ -93,6 +93,20 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+       <el-table-column
+        prop="OutPutQty"
+        label="出库数量"
+        width="100">
+         <template slot-scope="scope">
+      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+    </template>
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        :formatter="fieldFormatter"
+        label="状态"
+        width="100">
+      </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -295,7 +309,7 @@ export default {
       //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
       tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
       return tempsTabs;
     },

vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

@@ -93,6 +93,20 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+       <el-table-column
+        prop="OutPutQty"
+        label="出库数量"
+        width="100">
+         <template slot-scope="scope">
+      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+    </template>
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        :formatter="fieldFormatter"
+        label="状态"
+        width="100">
+      </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -296,7 +310,7 @@ export default {
       tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
       tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
       return tempsTabs;
     },