Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -43,7 +43,7 @@
               <Table type="add" :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
             </el-col>
             <el-col :span="col">
-              <selectTable @addProduct="addProduct"></selectTable>
+              <selectTable :all="true" @addProduct="addProduct"></selectTable>
             </el-col>
           </el-form>
         </el-row>

src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -2,27 +2,28 @@
   <div>
     <el-button type="primary" size="small" @click="dialogFormVisible=true" >设置分类</el-button>
     <el-dialog append-to-body title="设置分类" :visible.sync="dialogFormVisible" width="900px">
-      <div class="drawer__panel" >
-        <el-table
-          :data="classList"
-          stripe
-          row-key="itemclassid"
-          size="small"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-          <el-table-column>
-          </el-table-column>
-          <el-table-column
-            prop="itemclassname"
-            label="分类名称">
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="50">
-            <template slot-scope="scope">
-              <el-button type="text" size="mini" v-if="scope.row.disabled" @click="onSubmit(scope.row)">添 加</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-table
+        :data="classList"
+        stripe
+        row-key="itemclassid"
+        size="small"
+        height="500px"
+        default-expand-all
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+        <el-table-column>
+        </el-table-column>
+        <el-table-column
+          prop="itemclassname"
+          label="分类名称">
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="50">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" v-if="scope.row.disabled" @click="onSubmit(scope.row)">添 加</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
         <!-- <el-tree
           ref="tree"
           :data="classList"
@@ -31,7 +32,6 @@
           :default-expand-all="true"
           :default-checked-keys="data.checkArr">
         </el-tree> -->
-      </div>
       <!-- <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible=false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>

src/HDrpManagement/dispatch/modules/edit.vue

@@ -193,6 +193,7 @@ export default {
       this.receiveAddress()
       this.queryLogisticcom()
       this.defaultData.freightstatus = this.data.freightstatus
+      this.defaultData.billdate = this.data.billdate
       this.defaultData.remarks = this.data.remarks
     },
     async deleteContacts (row) {

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -26,7 +26,7 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
+            <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)">删 除</el-button>
           </template>
         </Table>
     <!-- <el-table

src/HDrpManagement/writeoffbill/modules/order/addOrder.vue

@@ -85,7 +85,7 @@ export default {
           "sa_orderid":item.sa_orderid,
           "sa_orderitemsid":item.sa_orderitemsid,
           "writeoffamount":0,
-          "remarks":""
+          "remarks":item.remarks
         }
       })
       const res = await this.$api.requested({

src/HDrpManagement/writeoffbill/modules/order/index.vue

@@ -141,6 +141,7 @@ export default {
   },
   created() {
     this.listData()
+    console.log(this.$route.name)
     this.tablecols = this.tool.tabelCol(this.$route.name).writeOffOrderTable.tablecols
   }
 }

src/template/product/index.vue

@@ -124,7 +124,7 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
-  props:['id'],
+  props:['id','all'],
   data () {
     return {
       params:{
@@ -135,7 +135,8 @@ export default {
           "pageSize": 20,
             "sa_itemgroupid":0,
             "where": {
-              "condition": ''
+              "condition": '',
+              "type": this.all ? '1' : '' //未上架商品也拉取
             }
         }
       },