Merge branch 'master' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/api/dialysis.js

@@ -272,3 +272,22 @@ export function CreateDryWeight(params) {
 
   })
 }
+
+export function GetDialysisgoods(params) {
+  return request({
+    url: '/api/dialysisgoods/get',
+    method: 'get',
+    params: params,
+
+  })
+}
+
+
+export function GetDialysisGoodStatistics(params) {
+  return request({
+    url: '/api/goodstatistics/get',
+    method: 'get',
+    params: params,
+
+  })
+}

src/xt_pages/dialysis/components/consumables.vue

@@ -1,190 +1,325 @@
 <template>
-    <div class="page_consumables">
-      <div class="cell clearfix">
-        <label class="title"> <span class="name">排班班次</span> : </label>
-        <div class="time">
-          <ul class>
-            <li
-              :class="item.value == schedulType ? 'active' : ''"
-              @click="selectSchedulType(item.value)"
-              v-for="item in schedulArr"
-              :key="item.value"
-            >
-              {{ item.label }}
-            </li>
-          </ul>
-        </div>
-
-        <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-        <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <div class="page_consumables">
+    <div class="cell clearfix">
+      <label class="title"> <span class="name">排班班次</span> : </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.value == schedulType ? 'active' : ''"
+            @click="selectSchedulType(item.value)"
+            v-for="item in schedulArr"
+            :key="item.value"
+          >
+            {{ item.label }}
+          </li>
+        </ul>
       </div>
-      <div class="cell clearfix" style="justify-content: space-between;">
-        <div style="display:flex;">
-          <label class="title"> <span class="name">分区</span> : </label>
-          <div class="time">
+
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+                      :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期时间" align="right"></el-date-picker>
+      <!--<el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"-->
+                <!--class="filter-item"/>-->
+      <!--<el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+    </div>
+    <div class="cell clearfix" style="justify-content: space-between;">
+      <div style="display:flex;">
+        <label class="title"> <span class="name">分区</span> : </label>
+        <div class="time">
           <ul class>
             <li
-            :class="item.id == partitionType ? 'active' : ''"
-            @click="selectPartitionType(item.id)"
-            v-for="item in partitionArr"
-            :key="item.id"
+              :class="item.id == partitionType ? 'active' : ''"
+              @click="selectPartitionType(item.id)"
+              v-for="item in partitionArr"
+              :key="item.id"
             >
-            {{ item.name }}
+              {{ item.name }}
             </li>
           </ul>
-          </div>
-        </div>
-        <div>
-            <el-button size="small" icon="el-icon-printer" type="primary">打印</el-button>
-            <el-button size="small" type="primary" @click="statistics">统计表</el-button>
         </div>
       </div>
       <div>
-          <el-table
-            :data="tableData"
-            height="350"
-            border
-            style="width: 100%">
-            <el-table-column
-            align="center"
-            type="selection"
-            width="55">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="date"
-            label="日期"
-            width="180">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="180">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
-            </el-table-column>
-        </el-table>
+        <!--<el-button size="small" icon="el-icon-printer" type="primary">打印</el-button>-->
+        <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
+    </div>
+    <div>
+      <el-table
+        :data="list"
+        height="350"
+        border
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="name"
+          v-for="item,index in good_types"
+          :key="index"
+          :label="item"
+        >
+          <template slot-scope="scope">
+            <span>{{scope.row.good_type[index].name}}</span>
+          </template>
 
-      <consumables-dialog ref="consumables"></consumables-dialog>
+        </el-table-column>
+
+      </el-table>
     </div>
+
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
+      background
+      align="right"
+      style="margin-top:20px;"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+    >
+    </el-pagination>
+
+    <consumables-dialog ref="consumables" :list="new_list"></consumables-dialog>
+  </div>
 </template>
 
 
 <script>
-import { GetAllZone } from "@/api/dialysis";
-import consumablesDialog from './consumablesDialog'
-export default {
-    components:{
-        consumablesDialog
+  import { GetAllZone,GetDialysisgoods } from '@/api/dialysis'
+  import consumablesDialog from './consumablesDialog'
+  import { uParseTime } from "@/utils/tools";
+
+  export default {
+    components: {
+      consumablesDialog
     },
-    data(){
-        return{
-            schedulType: 0,
-            schedulArr: [
-                { value: 0, label: "全部" },
-                { value: 1, label: "上午" },
-                { value: 2, label: "下午" },
-                { value: 3, label: "晚上" }
-            ],
-            selected_date:new Date(),
-            partitionArr:[],
-            partitionType: 0,
-            tableData: [{
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-08',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-06',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                },{
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-08',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-06',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }
-            ],
-            search_input:"",
-            searchAction:"",
+    data() {
+      return {
+        query:{
+          total:"",
+          schedule_date:"",
+          schedule_type:0,
+          partition_id:0,
+          page:1,
+          limit:10,
+        },
+        schedulType: 0,
+        schedulArr: [
+          { value: 0, label: '全部' },
+          { value: 1, label: '上午' },
+          { value: 2, label: '下午' },
+          { value: 3, label: '晚上' }
+        ],
+        selected_date: new Date(),
+        partitionArr: [],
+        partitionType: 0,
+        tableData: [{
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
         }
+        ],
+        search_input: '',
+        searchAction: '',
+        allGoodInfo:[],
+        list:[],
+        new_list:[],
+
+        good_types: [],
+
+      }
     },
-    created(){
-        this.getAllZone()
+    created() {
+      this.getAllZone()
+      let date = uParseTime(new Date(), "{y}-{m}-{d}")
+      var newDate = new Date();
+      var y = newDate.getFullYear();
+      var m = newDate.getMonth() + 1;
+      var d = newDate.getDate();
+      var schedule_date =
+        y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
+
+      this.query.schedule_date = schedule_date
+      this.query.schedule_type = 0
+      this.query.partition_id = 0
+      this.query.page = 1
+      this.GetDialysisgoods()
     },
-    methods:{
-        selectSchedulType(scheduleType) {
-            this.schedulType = scheduleType;
-        },
-        selectPartitionType(partitionType) {
-            this.partitionType = partitionType;
-        },
-        getAllZone: function() {
-            GetAllZone().then(response => {
-                if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-                return false;
-                } else {
-                this.partitionArr = response.data.data.zone;
-                this.partitionArr.unshift({ id: 0, name: "全部" });
-                }
-            });
-        },
-        statistics(){
-            this.$refs.consumables.show();
-        },
-        handleScheduleDateChange(){
+    methods: { handleSizeChange(val) {
+        this.query.limit = val;
+        this.GetDialysisgoods();
+      },
+      handleCurrentChange(val) {
+        this.query.page = val;
+        this.GetDialysisgoods();
+      },
 
-        },
-        search(){
-          
+      calCount(query_warehouseout_info) {
+        let total = 0
+        var array = []
+        array = query_warehouseout_info
+        for (let i = 0; i < array.length; i++) {
+          total = total + array[i].count
+        }
+        return total
+
+      },
+      getGoodUserInfo(good_type_id,good_user,last_good_user) {
+        if (good_user != null && good_user.length > 0) {
+          let desc = ""
+          for (let b = 0; b < good_user.length; b++){
+            if(good_type_id == good_user[b].good_type_id)
+              desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
+          }
+          console.log(desc)
+
+          return desc
+        } else if (good_user != null && good_user.length <= 0) {
+          if (last_good_user != null && last_good_user.length > 0) {
+            let desc = ""
+            for (let b = 0; b < last_good_user.length; b++){
+              if(good_type_id == last_good_user[b].good_type_id)
+                desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
+            }
+            console.log(desc)
+
+            return desc
+
+          }
+          return ""
         }
+      },
+      GetDialysisgoods() {
+        GetDialysisgoods(this.query).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            this.list = []
+            this.good_types = []
+            this.allGoodInfo = []
+
+            var res = response.data
+            this.total = res.data.total
+            this.good_types.push("姓名")
+            for (let a = 0; a <  res.data.good_type.length; a++){
+              this.good_types.push(res.data.good_type[a].type_name)
+            }
+            this.allGoodInfo = res.data.dialysis_goods
+
+            for(let i = 0; i < res.data.dialysis_goods.length; i++){
+              let arr =[]
+              let obj = {
+                id:0,
+                name:  res.data.dialysis_goods[i].patient.name
+
+              }
+              arr.push(obj)
+
+              for (let a = 0; a <  res.data.good_type.length; a++){
+                let obj = {
+                  id:res.data.good_type[a].id,
+                  name:""
+
+                }
+                arr.push(obj)
+
+
+              }
+
+
+
+              let newObj = {
+                "good_type":arr,
+                "good_user":res.data.dialysis_goods[i].good_user,
+                "last_good_user":res.data.dialysis_goods[i].last_good_user,
+                "good_user_detail":res.data.dialysis_goods[i].good_user_detail,
+                "last_good_user_detail":res.data.dialysis_goods[i].last_good_user_detail,
+              }
+              this.list.push(newObj)
+            }
+
+
+            for (let a = 0; a <  this.list.length; a++){
+              for (let b = 0; b <  this.list[a].good_type.length; b++){
+
+                if(this.list[a].good_type[b].id > 0){
+                  this.list[a].good_type[b].name = this.getGoodUserInfo(this.list[a].good_type[b].id,this.list[a].good_user,this.list[a].last_good_user)
+                }
+
+              }
+            }
+
+          }
+
+
+
+        })
+
+
+
+
+
+
+
+
+      },
+      selectSchedulType(scheduleType) {
+        this.schedulType = scheduleType
+        this.query.schedule_type = scheduleType
+        this.query.page = 1
+        this.GetDialysisgoods()
+
+      },
+      selectPartitionType(partitionType) {
+        this.partitionType = partitionType
+        this.query.partition_id = partitionType
+        this.query.page = 1
+
+        this.GetDialysisgoods()
+
+      },
+      getAllZone: function() {
+        GetAllZone().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.partitionArr = response.data.data.zone
+            this.partitionArr.unshift({ id: 0, name: '全部' })
+          }
+        })
+      },
+      statistics() {
+        this.$refs.consumables.show()
+      },
+      handleScheduleDateChange(val) {
+        this.query.schedule_date = val
+        this.query.page = 1
+        this.GetDialysisgoods()
+      },
+      search() {
+
+      }
     }
-}
+  }
 </script>
 
 
 <style lang="scss" scoped>
-.page_consumables{
-   .clearfix:after{
-       content:none;
-   }
-}
+  .page_consumables {
+
+  .clearfix:after {
+    content: none;
+  }
+
+  }
 </style>

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -1,110 +1,146 @@
 <template>
-    <el-dialog
+  <el-dialog
     title="统计表"
     width="800px"
     :visible.sync="visible"
     :before-close="_close"
-    >
+  >
     <div>
-        <el-date-picker
+      <el-date-picker
         style="width:150px;margin-right:10px"
         v-model="startTime"
         type="date"
         placeholder="选择日期"
         @change="selectStartime">
-        </el-date-picker>
-       <el-date-picker
+      </el-date-picker>
+      <el-date-picker
         style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
         placeholder="选择日期"
         @change="selectEndtime">
-        </el-date-picker>
-        <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
-        
+      </el-date-picker>
+      <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+
     </div>
     <div style="margin-top:10px;">
-        <el-table :data="tableData" border style="width: 100%" height="100%">
-            <el-table-column align="center" prop="date" label="商品类型" width="180">
-                <template slot-scope="scope">
-                     {{scope.row.type_name}}
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="规格名称" width="180">
-                <template slot-scope="scope">
-                    {{scope.row.specification_name}}
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="address" label="数量">
-               <template slot-scope="scope">
-                  {{scope.row.count}}
-              </template>
-            </el-table-column>
-        </el-table>
+      <el-table :data="tableData" border style="width: 100%" height="100%">
+        <el-table-column align="center" prop="date" label="商品类型" width="180">
+          <template slot-scope="scope">
+            {{scope.row.good_type_name}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="规格名称" width="180">
+          <template slot-scope="scope">
+            {{scope.row.good_name}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="address" label="数量">
+          <template slot-scope="scope">
+            {{scope.row.count}}
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
   </el-dialog>
 </template>
 
 
-
 <script>
-const moment = require('moment')
-import {getWareHouseOutList} from "@/api/consumable"
-import { parseTime } from "@/utils";
-export default {
-    data(){
-        return{
-            visible: false,
-            startTime: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            endTime:   moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            schedulArr: [
-                {value: 0, label: '全部班'},
-                {value: 1, label: '上午'},
-                {value: 2, label: '中午'},
-                {value: 3, label: '下午'},
-            ],
-            schedulType: 0,
-            partitionArr:[],
-            partitionType: 0,
-            tableData: [],
-            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD")
-        }
-    },
-    created(){
-       //统计今日出库的耗材
-       this.getlist()
+  const moment = require('moment')
+  import { GetDialysisGoodStatistics } from '@/api/dialysis'
+  import { parseTime } from '@/utils'
+
+  export default {
+    props: {
+      list: Array
     },
-    methods:{
-        _close: function(done) {
-            done();
-        },
-        show() {
-            this.visible = true;
+    data() {
+      return {
+        query:{
+          start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+          end_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD')
         },
-       getlist(){
-         var params = {
-            start_time:this.startTime,
-            end_time:this.endTime 
+        visible: false,
+        startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        endTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        schedulArr: [
+          { value: 0, label: '全部班' },
+          { value: 1, label: '上午' },
+          { value: 2, label: '中午' },
+          { value: 3, label: '下午' }
+        ],
+
+        schedulType: 0,
+        partitionArr: [],
+        partitionType: 0,
+        tableData: [],
+        start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD')
+      }
+    },
+    created() {
+      //统计今日出库的耗材
+
+    },
+    methods: {
+      calCount(query_warehouseout_info) {
+        let total = 0
+        var array = []
+        array = query_warehouseout_info
+        for (let i = 0; i < array.length; i++) {
+          total = total + array[i].count
+        }
+        return total
+
+      },
+      GetDialysisGoodStatistics(){
+        GetDialysisGoodStatistics(this.query).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = []
+            for (let i = 0; i < response.data.data.stock_out.length; i++) {
+              let obj = {
+                good_name: response.data.data.stock_out[i].specification_name,
+                good_type_name: response.data.data.stock_out[i].type.type_name,
+                count:this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+              }
+              this.tableData.push(obj)
+            }
+
           }
-        getWareHouseOutList(params).then(response=>{
-           if(response.data.state == 1){
-             var wareoutlist = response.data.data.wareoutlist
-             console.log("wareoutlist",wareoutlist)
-             this.tableData = wareoutlist
-           }
+
+
         })
-       },
-      selectStartime(){
+      },
+
+      _close: function(done) {
+        done()
+      },
+      show() {
+        this.GetDialysisGoodStatistics()
+
+        this.visible = true
+      },
+
+      selectStartime() {
         this.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
+        this.query.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
+        this.GetDialysisGoodStatistics()
+
       },
-      selectEndtime(){
+      selectEndtime() {
         this.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
+        this.query.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
+        this.GetDialysisGoodStatistics()
+
       },
-      toPrint(){
-        this.$router.push("/dialysis/consumables_print?startime="+this.start_time+"&endtime="+this.end_time)
+      toPrint() {
+        this.$router.push('/dialysis/consumables_print?startime=' + this.start_time + '&endtime=' + this.end_time)
       }
 
     }
-}
+  }
 </script>

src/xt_pages/dialysis/consumables_print.vue

@@ -12,11 +12,14 @@
             <div id="print_content">
                 <div class="print_main_content">
                     <div class="order_title_panl">
-                        <span class="main_title">透析参数统计表</span>
+                        <span class="main_title">耗材统计表</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
-                        <p>统计时间:{{start_time}} - {{end_time}}</p>
+                        <p>统计时间:{{query.start_time}} - {{query.end_time}}</p>
                     </div>
+                  <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
+                    <p>印单日期:{{print_time}}</p>
+                  </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
@@ -30,13 +33,15 @@
                             <tbody>
                                 <tr v-for='(item,index) in this.tableData' :key="index">
                                     <td>{{index + 1}}</td>
-                                    <td>{{item.type_name}}</td>
-                                    <td>{{item.specification_name}}</td>
+                                    <td>{{item.good_type_name}}</td>
+                                    <td>{{item.good_name}}</td>
                                     <td>{{item.count}}</td>
                                 </tr>
                             </tbody>
                         </table>
                     </div>
+
+
                 </div>
             </div>
         </div>
@@ -46,14 +51,22 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
+const moment = require('moment')
+
 import {getWareHouseOutList} from "@/api/consumable"
 import { parseTime } from "@/utils";
+import { GetDialysisGoodStatistics } from '@/api/dialysis'
+
 export default {
     components:{
         BreadCrumb
     },
     data(){
         return{
+          query:{
+            start_time:0,
+            end_time:0
+          },
             crumbs: [
                 { path: false, name: '耗材药品' },
                 { path: false, name: '药品打印' }
@@ -61,9 +74,41 @@ export default {
             start_time:"",
             end_time:"",
             tableData:[],
-        }  
+           print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        }
     },
     methods:{
+      calCount(query_warehouseout_info) {
+        let total = 0
+        var array = []
+        array = query_warehouseout_info
+        for (let i = 0; i < array.length; i++) {
+          total = total + array[i].count
+        }
+        return total
+
+      },
+      GetDialysisGoodStatistics(){
+        GetDialysisGoodStatistics(this.query).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = []
+            for (let i = 0; i < response.data.data.stock_out.length; i++) {
+              let obj = {
+                good_name: response.data.data.stock_out[i].specification_name,
+                good_type_name: response.data.data.stock_out[i].type.type_name,
+                count:this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+              }
+              this.tableData.push(obj)
+            }
+
+          }
+
+
+        })
+      },
         printAction: function() {
             const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
@@ -78,7 +123,7 @@ export default {
         getlist(){
          var params = {
             start_time:this.start_time,
-            end_time:this.end_time 
+            end_time:this.end_time
           }
         getWareHouseOutList(params).then(response=>{
            if(response.data.state == 1){
@@ -91,10 +136,10 @@ export default {
     },
     created(){
       var startime = this.$route.query.startime
-       this.start_time = startime
+       this.query.start_time = startime
       var endtime =  this.$route.query.endtime
-      this.end_time = endtime
-      this.getlist()
+      this.query.end_time = endtime
+      this.GetDialysisGoodStatistics()
     }
 }
 </script>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -482,265 +482,265 @@
           <!--          </el-col>-->
 
           <!--透析耗材-->
-          <el-col
-            :span="8"
-            v-if="isShows('血液透析干粉') && config.is_open == 1"
-          >
-            <el-form-item label="血液透析干粉：">
-              <el-select
-                v-model="dialysisPrescription.niprocart"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="(option, index) in niprocart_info"
-                  :key="index + 'p'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用动静脉穿刺针：">
-              <el-select
-                v-model="dialysisPrescription.jms"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in jms_info"
-                  :key="index + 'a'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_info"
-                  :key="index + 's'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针16G：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set_16"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_16_info"
-                  :key="index + 'd'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用血液灌流器：">
-              <el-select
-                v-model="dialysisPrescription.hemoperfusion"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in hemoperfusion_info"
-                  :key="index + 'f'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液透析干粉') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液透析干粉：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.niprocart"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+                <!--<el-option-->
+                  <!--v-for="(option, index) in niprocart_info"-->
+                  <!--:key="index + 'p'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.jms"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('空心纤维血液透析器') && config.is_open == 1"
-          >
-            <el-form-item label="空心纤维血液透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyser_sterilised"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in jms_info"-->
+                  <!--:key="index + 'a'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyser_sterilised_info"
-                  :key="index + 'g'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_info"-->
+                  <!--:key="index + 's'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针16G：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set_16"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('中空纤维透析器') && config.is_open == 1"
-          >
-            <el-form-item label="中空纤维透析器：">
-              <el-select
-                v-model="dialysisPrescription.filtryzer"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_16_info"-->
+                  <!--:key="index + 'd'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用血液灌流器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.hemoperfusion"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in filtryzer_info"
-                  :key="index + 'h'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in hemoperfusion_info"-->
+                  <!--:key="index + 'f'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('空心纤维血液透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="空心纤维血液透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyser_sterilised"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">
-            <el-form-item label="透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyzers"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyser_sterilised_info"-->
+                  <!--:key="index + 'g'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('中空纤维透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="中空纤维透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.filtryzer"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyzers_info"
-                  :key="index + 1"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in filtryzer_info"-->
+                  <!--:key="index + 'h'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">
-            <el-form-item label="注射器：">
-              <el-select
-                v-model="dialysisPrescription.injector"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">-->
+            <!--<el-form-item label="透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyzers"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in injector_info"
-                  :key="index + 'j'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyzers_info"-->
+                  <!--:key="index + 1"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('体外循环血路管') && config.is_open == 1"
-          >
-            <el-form-item label="体外循环血路管：">
-              <el-select
-                v-model="dialysisPrescription.bloodlines"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">-->
+            <!--<el-form-item label="注射器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.injector"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in bloodlines_info"
-                  :key="index + 'k'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in injector_info"-->
+                  <!--:key="index + 'j'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('体外循环血路管') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="体外循环血路管：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.bloodlines"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"
-          >
-            <el-form-item label="血液净化补液管路(置换管)：">
-              <el-select
-                v-model="dialysisPrescription.tubing_hemodialysis"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in bloodlines_info"-->
+                  <!--:key="index + 'k'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液净化补液管路(置换管)：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.tubing_hemodialysis"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in tubingHemodialysis_info"
-                  :key="index + 'x'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in tubingHemodialysis_info"-->
+                  <!--:key="index + 'x'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">
-            <el-form-item label="护理包：">
-              <el-select
-                v-model="dialysisPrescription.package"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">-->
+            <!--<el-form-item label="护理包：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.package"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in safe_package_info"
-                  :key="index + 'z'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in safe_package_info"-->
+                  <!--:key="index + 'z'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('A液') && config.is_open == 1">
-            <el-form-item label="A液：">
-              <el-select
-                v-model="dialysisPrescription.a_liquid"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('A液') && config.is_open == 1">-->
+            <!--<el-form-item label="A液：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.a_liquid"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in aliquid_info"
-                  :key="index + 'c'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in aliquid_info"-->
+                  <!--:key="index + 'c'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
 
 

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -25,14 +25,14 @@
     </div>
 
     <div class="app-container">
-      <sales-return-dialog
+
+      <stock-in-dialog
         ref="dialog"
         :propForm="propForm"
         :visibility="isVisibility"
         v-on:dialog-comfirm="comfirm"
         v-on:dialog-cancle="cancle"
-      ></sales-return-dialog>
-
+      ></stock-in-dialog>
       <div class="filter-container">
         <div class="cell clearfix">
           <label class="title"><span class="name">退库时间</span> : </label>
@@ -192,12 +192,12 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getCancelStockConfig, postCancelStock } from "@/api/stock";
-import SalesReturnDialog from "./Dialog/salesReturnDialog";
+import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
+import StockInDialog from './Dialog/stockInDialog'
 
 export default {
-  components: { BreadCrumb, SalesReturnDialog },
+  components: { StockInDialog, BreadCrumb },
   name: "salesReturnOrderAdd",
 
   data() {
@@ -247,37 +247,35 @@ export default {
       warehouseOutInfoList: [],
       manufacturer: [],
       dealer: [],
-      goodType: []
+      goodType: [],
+      goodInfo:[],
     };
   },
   methods: {
     comfirm: function(val) {
-      this.$refs.dialog.hide();
+      this.propForm.goodType = []
+      this.propForm.goods = []
+
+      this.$refs.dialog.hide()
       if (val.selectedGoodInfo.length > 0) {
-        for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+        for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
-            this.recordInfo.recordData[this.currentIndex].good_type_id =
-              val.goodTypeId;
-            this.recordInfo.recordData[this.currentIndex].good_id =
-              val.selectedGoodInfo[i].id;
+            this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
+            this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+
           } else {
-            const tempForm = {};
-            tempForm["good_type_id"] = val.goodTypeId;
-            tempForm["good_id"] = val.selectedGoodInfo[i].id;
+            const tempForm = {}
+            tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
+            tempForm['good_id'] = val.selectedGoodInfo[i].id
             tempForm["return_count"] = "";
-            this.recordInfo.recordData.splice(
-              this.currentIndex + 1,
-              0,
-              tempForm
-            );
+            this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
       }
+      this.currentIndex = -1
 
-      this.propForm.goodType = [];
-
-      this.currentIndex = -1;
     },
+
     cancle: function() {
       this.$refs.dialog.hide();
       this.propForm.goodType = [];
@@ -285,87 +283,32 @@ export default {
     GetConfigInfo: function() {
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
 
-      const params = {
-        type: this.$route.query.type
-      };
-      getCancelStockConfig(params).then(response => {
+      GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          loading.close();
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          loading.close();
-          var warehouseOutInfoList = response.data.data.warehouseOutInfoList;
-          this.warehouseOutInfoList = response.data.data.warehouseOutInfoList;
-          for (let i = 0; i < warehouseOutInfoList.length; i++) {
-            if (warehouseOutInfoList[i].info.manufacturers.id > 0) {
-              this.manufacturer.push(
-                warehouseOutInfoList[i].info.manufacturers
-              );
-            }
-            if (warehouseOutInfoList[i].info.dealers.id > 0) {
-              this.dealer.push(warehouseOutInfoList[i].info.dealers);
-            }
-          }
-          for (let i = 0; i < warehouseOutInfoList.length; i++) {
-            this.goodType.push(warehouseOutInfoList[i].info.type);
-          }
-          for (let i = 0; i < warehouseOutInfoList.length; i++) {
-            this.propForm.goodType.push(warehouseOutInfoList[i].info.type);
-          }
-
-          for (let i = 0; i < warehouseOutInfoList.length; i++) {
-            this.propForm.goodInfo.push(warehouseOutInfoList[i].info);
-          }
-
-          const obj = {};
-          const obj2 = {};
-          const obj3 = {};
-          const obj4 = {};
-          const obj5 = {};
-
-          // 去重复
-          this.manufacturer = this.manufacturer.reduce((cur, next) => {
-            obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-          // 去重复
-          this.dealer = this.dealer.reduce((cur, next) => {
-            obj2[next.id] ? "" : (obj2[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-          this.goodType = this.goodType.reduce((cur, next) => {
-            obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-          this.propForm.goodInfo = this.propForm.goodInfo.reduce(
-            (cur, next) => {
-              obj4[next.id] ? "" : (obj4[next.id] = true && cur.push(next));
-              return cur;
-            },
-            []
-          );
-
-          this.propForm.goodType = this.propForm.goodType.reduce(
-            (cur, next) => {
-              obj5[next.id] ? "" : (obj5[next.id] = true && cur.push(next));
-              return cur;
-            },
-            []
-          );
-
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
-          this.form.manufacturer = 0;
-          this.form.dealer = 0;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
+          this.goodType = response.data.data.goodType
+          this.goodInfo = response.data.data.goodInfo
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+          this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+          this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+          this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
+          this.form.manufacturer = 0
+          this.form.dealer = 0
         }
-      });
+        loading.close()
+      })
+
     },
+
     typeName: function(good_type_id) {
       let name = "";
       for (let i = 0; i < this.goodType.length; i++) {
@@ -376,13 +319,13 @@ export default {
       return name;
     },
     specificationName: function(good_info_id) {
-      let name = "";
-      for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-        if (this.propForm.goodInfo[i].id == good_info_id) {
-          name = this.propForm.goodInfo[i].specification_name;
+      let name = ''
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].specification_name
         }
       }
-      return name;
+      return name
     },
     handleEdit: function(index, row) {
       const tempObj = {};
@@ -414,216 +357,72 @@ export default {
       }
     },
     showDialog(index, row) {
-      this.currentIndex = index;
-      this.propForm.goodType = [];
-      this.propForm.goods = [];
-
-      if (this.form.manufacturer == -1 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.dealers.id == 0 &&
-            this.warehouseOutInfoList[i].info.manufacturers.id == 0
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
-
-      if (this.form.manufacturer == -1 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (this.warehouseOutInfoList[i].info.manufacturers.id == 0) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
-
-      if (this.form.manufacturer == -1 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.manufacturers.id == 0 &&
-            this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
-
-      if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-          this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-        }
-      }
-
-      if (this.form.manufacturer == 0 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (this.warehouseOutInfoList[i].info.dealers.id == 0) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.currentIndex = index
+      this.isVisibility = true
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
       }
+      GetAllGoodInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+            loading.close()
 
-      if (this.form.manufacturer != 0 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.dealers.id == 0 &&
-            this.warehouseOutInfoList[i].info.manufacturers.id ==
-              this.form.manufacturer
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
+          } else {
+            loading.close()
 
-      if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.manufacturers.id ==
-              this.form.manufacturer &&
-            this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error('该厂商或经销商没有物品信息')
+              return
+            }
+            this.$refs.dialog.show()
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+            }
+            const obj = {}
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
           }
-        }
-      }
 
-      if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
-      if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (
-            this.warehouseOutInfoList[i].info.manufacturers.id ==
-            this.form.manufacturer
-          ) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info);
-          }
-        }
-      }
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = []
+            let goodObj = {}
 
-      // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-      //   for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-      //     this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-      //   }
-      //   const obj3 = {}
-      //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-      //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-      //     return cur
-      //   }, [])
-      //
-      // } else {
-      //   if(this.form.manufacturer == 0 && this.form.dealer != 0){
-      //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-      //       if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer){
-      //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-      //       }
-      //     }
-      //   }
-      //   if(this.form.manufacturer != 0 && this.form.dealer == 0){
-      //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-      //       if(this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
-      //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-      //       }
-      //     }
-      //   }
-      //   if(this.form.manufacturer != 0 && this.form.dealer != 0){
-      //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-      //       if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer && this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
-      //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-      //       }
-      //     }
-      //   }
-      //   const obj3 = {}
-      //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-      //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-      //     return cur
-      //   }, [])
-      // }
-
-      const obj3 = {};
-      this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
-        return cur;
-      }, []);
-      const obj4 = {};
-      this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-        obj4[next.id] ? "" : (obj4[next.id] = true && cur.push(next));
-        return cur;
-      }, []);
-
-      for (let i = 0; i < this.propForm.goodType.length; i++) {
-        let goodInfo = [];
-        let goodObj = {};
-
-        for (let a = 0; a < this.propForm.goodInfo.length; a++) {
-          var respObj = this.propForm.goodInfo[a];
-          respObj["isSelected"] = false;
-          if (
-            respObj.type.id == this.propForm.goodType[i].id &&
-            respObj.id != 0
-          ) {
-            console.log(respObj.id);
-            goodInfo.push(respObj);
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a]
+              respObj['isSelected'] = false
+              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj)
+              }
+            }
+            const obj = {}
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+            this.propForm.goods.push(goodObj)
           }
         }
-        const obj = {};
-        goodInfo = goodInfo.reduce((cur, next) => {
-          obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-          return cur;
-        }, []); // 设置cur默认类型为数组，并且初始值为空的数组
-
-        if (goodInfo.length != 0) {
-          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
-          this.propForm.goods.push(goodObj);
-        }
-      }
-      console.log(this.propForm.goods);
-
-      this.$refs.dialog.show();
-      // }
-
-      // this.currentIndex = index
-      // if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-      //
-      // } else {
-      //   this.$refs.dialog.show()
-      //
-      //   for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-      //     if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
-      //       this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
-      //     }
-      //   }
-      //   const obj3 = {}
-      //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-      //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-      //     return cur
-      //   }, [])
-      // }
+      )
     },
+
     back() {
       this.$router.go(-1);
     },
     submit() {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
-          if (this.form.manufacturer == 0) {
-            this.$message.error("厂商不能为空");
-            return;
-          }
           const array = this.recordInfo.recordData;
           let total = 0;
           for (let i = 0; i < array.length; i++) {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -9,11 +9,12 @@
       </div>
     </div>
     <div class="app-container">
-      <sales-return-dialog ref="dialog" :propForm="propForm"
-                           :visibility="isVisibility"
-                           v-on:dialog-comfirm="comfirm"
-                           v-on:dialog-cancle="cancle"></sales-return-dialog>
-
+      <stock-in-dialog
+        ref="dialog" :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      ></stock-in-dialog>
       <div class="cell clearfix">
 
         <label class="title"><span class="name">退库时间</span> : </label>
@@ -135,12 +136,12 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
+  import StockInDialog from './Dialog/stockInDialog'
 
   export default {
-    components: { BreadCrumb, SalesReturnDialog },
+    components: { StockInDialog, BreadCrumb },
     name: 'cancelStockOrderEdit',
 
     data() {
@@ -185,10 +186,12 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods: [],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
-          title: '入库'
+          manufacturer: 0,
+          dealer: 0
         },
 
         form: {
@@ -199,7 +202,8 @@
         cancelStock: {},
         manufacturer: [],
         dealer: [],
-        goodType: []
+        goodType: [],
+        goodInfo:[],
       }
     },
     methods: {
@@ -209,12 +213,12 @@
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
             } else {
               const tempForm = {}
               tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
@@ -225,75 +229,37 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-      }, GetConfigInfo: function() {
-        const params = {
-          type: this.$route.query.type
-        }
+      },
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
-        getCancelStockConfig(params).then(response => {
 
+        GetAllConfig().then(response => {
           if (response.data.state == 0) {
-            loading.close()
             this.$message.error(response.data.msg)
             return false
           } else {
-            loading.close()
-            var warehouseOutInfoList = response.data.data.warehouseOutInfoList
-            this.warehouseOutInfoList = response.data.data.warehouseOutInfoList
-            for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              if (warehouseOutInfoList[i].info.manufacturers.id > 0) {
-                this.manufacturer.push(warehouseOutInfoList[i].info.manufacturers)
-              }
-              if (warehouseOutInfoList[i].info.dealers.id > 0) {
-                this.dealer.push(warehouseOutInfoList[i].info.dealers)
-              }
-            }
-            for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.goodType.push(warehouseOutInfoList[i].info.type)
-            }
-
-
-            for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseOutInfoList[i].info)
-            }
-
-            const obj = {}
-            const obj2 = {}
-            const obj3 = {}
-            const obj4 = {}
-            // 去重复
-            this.manufacturer = this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            // 去重复
-            this.dealer = this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.goodType = this.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
-
-
-            console.log(this.goodType)
-
+            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
+            this.form.manufacturer = 0
+            this.form.dealer = 0
           }
+          loading.close()
         })
-      }, typeName: function(good_type_id) {
+
+      },
+
+      typeName: function(good_type_id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
@@ -301,11 +267,11 @@
           }
         }
         return name
-      }, specificationName: function(good_info_id) {
+      },  specificationName: function(good_info_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
           }
         }
         return name
@@ -346,20 +312,69 @@
         } else {
           return ''
         }
-      }, showDialog(index, row) {
+      },
+      showDialog(index, row) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.currentIndex = index
-        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-          if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
-          }
+        this.isVisibility = true
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
         }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-        this.$refs.dialog.show()
-      }, back() {
+        GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+              loading.close()
+
+            } else {
+              loading.close()
+
+              if (response.data.data.goodInfo.length <= 0) {
+                this.$message.error('该厂商或经销商没有物品信息')
+                return
+              }
+              this.$refs.dialog.show()
+              for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              }
+              const obj = {}
+              this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+
+            for (let i = 0; i < this.propForm.goodType.length; i++) {
+              let goodInfo = []
+              let goodObj = {}
+
+              for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+                var respObj = response.data.data.goodInfo[a]
+                respObj['isSelected'] = false
+                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                  goodInfo.push(respObj)
+                }
+              }
+              const obj = {}
+              goodInfo = goodInfo.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+              this.propForm.goods.push(goodObj)
+            }
+          }
+        )
+      },
+
+      back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {

src/xt_pages/stock/config/goodType.vue

@@ -76,22 +76,13 @@
                 placement="top"
               >
                 <el-button
-                  v-if="scope.row.type == 0"
                   size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)"
                 >
                 </el-button>
-                <el-button
-                  v-if="scope.row.type == 1"
-                  size="small"
-                  type="info"
-                  plain
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)"
-                >
-                </el-button>
+
               </el-tooltip>
               <el-tooltip
                 class="item"
@@ -100,22 +91,13 @@
                 placement="top"
               >
                 <el-button
-                  v-if="scope.row.type == 0"
                   size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)"
                 >
                 </el-button>
-                <el-button
-                  v-if="scope.row.type == 1"
-                  size="small"
-                  type="info"
-                  plain
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)"
-                >
-                </el-button>
+
               </el-tooltip>
             </template>
           </el-table-column>
@@ -258,10 +240,7 @@ export default {
       this.getList();
     },
     handleEdit: function(index, row) {
-      if (row.type == 1) {
-        this.$message.error("该记录为系统配置，无法编辑");
-        return;
-      }
+
       this.goodType.editTypeId = row.id;
       this.goodType.editTypeIndex = index;
       let params = {
@@ -283,10 +262,7 @@ export default {
       });
     },
     handleDelete: function(index, row) {
-      if (row.type == 1) {
-        this.$message.error("该记录为系统配置，无法删除");
-        return;
-      }
+
       this.$confirm("确认删除这条商品类型?", "删除商品类型", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/xt_pages/stock/salesReturnEdit.vue

@@ -10,10 +10,17 @@
 
   <div class="app-container">
 
-    <sales-return-dialog ref="dialog" :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+    <!--<sales-return-dialog ref="dialog" :propForm="propForm"-->
+                     <!--:visibility="isVisibility"-->
+                     <!--v-on:dialog-comfirm="comfirm"-->
+                     <!--v-on:dialog-cancle="cancle"></sales-return-dialog>-->
+    <stock-in-dialog
+      ref="dialog"
+      :propForm="propForm"
+      :visibility="isVisibility"
+      v-on:dialog-comfirm="comfirm"
+      v-on:dialog-cancle="cancle"
+    ></stock-in-dialog>
 
     <div class="cell clearfix">
             <label class="title"><span class="name">退货时间</span> : </label>
@@ -137,16 +144,18 @@
   import { uParseTime } from '@/utils/tools'
 
   import {
+    GetAllConfig,
     deleteSalesReturnInfo,
     getReturnList,
     getSalesReturnConfig,
-    editSalesReturnInfo
+    editSalesReturnInfo,
+    GetAllGoodInfoByID
   } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
   import BreadCrumb from '../components/bread-crumb'
+  import StockInDialog from './Dialog/stockInDialog'
 
   export default {
-    components: { BreadCrumb, SalesReturnDialog },
+    components: { StockInDialog, BreadCrumb },
     name: 'salesReturnEdit',
 
     data() {
@@ -224,77 +233,30 @@
         this.$refs.dialog.hide()
         this.propForm.goodType = []
 
-      }, GetConfigInfo: function() {
-        const params = {
-          type: this.$route.query.type
-
-        }
+      },
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        getSalesReturnConfig(params).then(response => {
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        GetAllConfig().then(response => {
           if (response.data.state == 0) {
-            loading.close()
-
-            this.$message.error(response.data.msg)
-            return false
+            this.$message.error(response.data.msg);
+            return false;
           } else {
-            loading.close()
-
-            var warehouseInfoList = response.data.data.warehouseInfoList
-            this.warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              if (warehouseInfoList[i].info.manufacturers.id > 0) {
-                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
-              }
-              if (warehouseInfoList[i].info.dealers.id > 0) {
-                this.dealer.push(warehouseInfoList[i].info.dealers)
-              }
-            }
-
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.goodType.push(this.warehouseInfoList[i].info.type)
-            }
-
-
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-
-
-            const obj = {}
-            const obj2 = {}
-            const obj3 = {}
-
-
-            // 去重复
-            this.manufacturer = this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            // 去重复
-            this.dealer = this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-            this.goodType = this.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
-            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
-            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
-            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
-
-
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            this.goodType = response.data.data.goodType;
+            this.goodInfo = response.data.data.goodInfo;
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
-        })
-      }, typeName: function(good_type_id) {
+          loading.close();
+        });
+      },
+      typeName: function(good_type_id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
@@ -348,185 +310,70 @@
         } else {
           return ''
         }
-      }, showDialog(index, row) {
-        this.currentIndex = index
-        this.propForm.goodType = []
-        this.propForm.goods = []
-
-
-        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+      },
+      showDialog(index, row) {
+        this.currentIndex = index;
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
 
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        };
+        GetAllGoodInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error("该厂商或经销商没有物品信息");
+              return;
             }
-          }
-        }
-        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            this.$refs.dialog.show();
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodType.push(
+                response.data.data.goodInfo[i].GoodsType
+              );
             }
+            const obj = {};
+            this.propForm.goodType = this.propForm.goodType.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
           }
-        }
-
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-        const obj4 = {}
-        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-
 
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = [];
+            let goodObj = {};
 
-
-
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          let goodInfo = []
-          let goodObj = {}
-
-          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
-            var respObj = this.propForm.goodInfo[a]
-            respObj['isSelected'] = false
-            if (respObj.type.id == this.propForm.goodType[i].id) {
-              goodInfo.push(respObj)
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a];
+              respObj["isSelected"] = false;
+              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj);
+              }
             }
+            const obj = {};
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            }, []); // 设置cur默认类型为数组，并且初始值为空的数组
+
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
+            this.propForm.goods.push(goodObj);
           }
-          const obj = {}
-          goodInfo = goodInfo.reduce((cur, next) => {
-            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-            return cur
-          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
-          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
-          this.propForm.goods.push(goodObj)
-
-        }
-
-
-
-        // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-        //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //   }
-        //   const obj3 = {}
-        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-        //     return cur
-        //   }, [])
-        // } else {
-        //
-        //
-        //   if(this.form.manufacturer == 0 && this.form.dealer != 0){
-        //
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //   }
-        //   if(this.form.manufacturer != 0 && this.form.dealer == 0){
-        //     console.log(this.warehouseInfoList)
-        //
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //
-        //   }
-        //   if(this.form.manufacturer != 0 && this.form.dealer != 0){
-        //
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //
-        //   }
-        //   const obj3 = {}
-        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-        //     return cur
-        //   }, [])
-        // }
-        this.$refs.dialog.show()
-
-
-
-      }, back() {
+          console.log(this.propForm)
+          loading.close();
+        });
+      },
+      back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -12,10 +12,12 @@
     </div>
 
     <div class="app-container">
-      <sales-return-dialog ref="dialog" :propForm="propForm"
-                           :visibility="isVisibility"
-                           v-on:dialog-comfirm="comfirm"
-                           v-on:dialog-cancle="cancle"></sales-return-dialog>
+      <stock-in-dialog
+        ref="dialog" :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      ></stock-in-dialog>
       <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
         <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false"
@@ -137,12 +139,13 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { getSalesReturnConfig, postSalesReturn } from '@/api/stock'
+  import { getSalesReturnConfig, postSalesReturn,GetAllGoodInfoByID,GetAllConfig } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
   import BreadCrumb from '../components/bread-crumb'
+  import StockInDialog from './Dialog/stockInDialog'
 
   export default {
-    components: { BreadCrumb, SalesReturnDialog },
+    components: { StockInDialog, BreadCrumb, SalesReturnDialog },
     name: 'salesReturnOrderAdd',
 
     data() {
@@ -218,10 +221,8 @@
         this.$refs.dialog.hide()
         this.propForm.goodType = []
 
-      }, GetConfigInfo: function() {
-        const params = {
-          type: this.type
-        }
+      },
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',
@@ -229,55 +230,27 @@
           background: 'rgba(0, 0, 0, 0.7)'
         })
 
-        getSalesReturnConfig(params).then(response => {
+        GetAllConfig().then(response => {
           if (response.data.state == 0) {
-            loading.close()
-
             this.$message.error(response.data.msg)
             return false
           } else {
-            loading.close()
-            var warehouseInfoList = response.data.data.warehouseInfoList
-            this.warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              if (warehouseInfoList[i].info.manufacturers.id > 0) {
-                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
-              }
-              if (warehouseInfoList[i].info.dealers.id > 0) {
-                this.dealer.push(warehouseInfoList[i].info.dealers)
-              }
-            }
-
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.goodType.push(this.warehouseInfoList[i].info.type)
-            }
-            const obj = {}
-            const obj2 = {}
-            const obj3 = {}
-            // 去重复
-            this.manufacturer = this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            // 去重复
-            this.dealer = this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-            this.goodType = this.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
-            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
-
-
+            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
+            this.form.manufacturer = 0
+            this.form.dealer = 0
           }
+          loading.close()
         })
-      }, typeName: function(good_type_id) {
+
+      },
+      typeName: function(good_type_id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
@@ -287,9 +260,9 @@
         return name
       }, specificationName: function(good_info_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
           }
         }
         return name
@@ -319,141 +292,69 @@
         } else {
           return ''
         }
-      }, showDialog(index, row) {
+      },
+      showDialog(index, row) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.currentIndex = index
-        this.propForm.goodType = []
-        this.propForm.goods = []
-
-        //根据选择经销商和厂商过滤商品类型
-
-        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
+        this.isVisibility = true
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
         }
+        GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+              loading.close()
 
-        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            } else {
+              loading.close()
 
+              if (response.data.data.goodInfo.length <= 0) {
+                this.$message.error('该厂商或经销商没有物品信息')
+                return
+              }
+              this.$refs.dialog.show()
+              for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              }
+              const obj = {}
+              this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
             }
-          }
-        }
-        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
 
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-        const obj4 = {}
-        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-          return cur
-        }, [])
+            for (let i = 0; i < this.propForm.goodType.length; i++) {
+              let goodInfo = []
+              let goodObj = {}
 
-
-
-
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          let goodInfo = []
-          let goodObj = {}
-
-          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
-            var respObj = this.propForm.goodInfo[a]
-            respObj['isSelected'] = false
-            if (respObj.type.id == this.propForm.goodType[i].id) {
-              goodInfo.push(respObj)
+              for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+                var respObj = response.data.data.goodInfo[a]
+                respObj['isSelected'] = false
+                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                  goodInfo.push(respObj)
+                }
+              }
+              const obj = {}
+              goodInfo = goodInfo.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+              this.propForm.goods.push(goodObj)
             }
           }
-          const obj = {}
-          goodInfo = goodInfo.reduce((cur, next) => {
-            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-            return cur
-          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
-          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
-          this.propForm.goods.push(goodObj)
-
-        }
-
-
-
-
-
-
+        )
+      },
 
-        this.$refs.dialog.show()
-      }, back() {
+      back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -482,7 +482,8 @@
         } else {
           return ''
         }
-      }, showDialog(index, row) {
+      },
+      showDialog(index, row) {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -25,13 +25,24 @@
     </div>
 
     <div class="app-container">
-      <sales-return-dialog
-        ref="dialog"
-        :propForm="propForm"
+    <!---->
+      <!--<stock-in-dialog-->
+        <!--ref="dialog" :propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+
+      <stock-in-dialog
+        ref="dialog" :propForm="propForm"
         :visibility="isVisibility"
         v-on:dialog-comfirm="comfirm"
         v-on:dialog-cancle="cancle"
-      ></sales-return-dialog>
+      >
+
+
+      </stock-in-dialog>
+
 
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
@@ -221,12 +232,13 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getSalesReturnConfig, postWarehouseOut } from "@/api/stock";
-import SalesReturnDialog from "./Dialog/salesReturnDialog";
+import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID } from "@/api/stock";
+
 import BreadCrumb from "../components/bread-crumb";
+import StockInDialog from './Dialog/stockInDialog'
 
 export default {
-  components: { BreadCrumb, SalesReturnDialog },
+  components: { StockInDialog,  BreadCrumb },
   name: "salesReturnOrderAdd",
 
   data() {
@@ -274,51 +286,78 @@ export default {
       warehouseInfoList: [],
       manufacturer: [],
       dealer: [],
-      goodType: []
+      goodType: [],
+      goodInfo:[]
     };
   },
   methods: {
     comfirm: function(val) {
-      this.$refs.dialog.hide();
-      this.propForm.goodType = [];
+      this.propForm.goodType = []
+      this.propForm.goods = []
+
+      this.$refs.dialog.hide()
+      console.log(val)
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
-            this.recordInfo.recordData[this.currentIndex].good_type_id =
-              val.selectedGoodInfo[i].good_type_id;
-            this.recordInfo.recordData[this.currentIndex].good_id =
-              val.selectedGoodInfo[i].id;
-            this.recordInfo.recordData[
-              this.currentIndex
-            ].price = val.selectedGoodInfo[i].buy_price.toString();
+            this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
+            this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
+
           } else {
-            console.log(val.selectedGoodInfo[i].buy_price.toString());
-            const tempForm = {};
-            tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
-            tempForm["good_id"] = val.selectedGoodInfo[i].id;
-            tempForm["count"] = "";
-            tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
-            tempForm["remark"] = "";
-            this.recordInfo.recordData.splice(
-              this.currentIndex + 1,
-              0,
-              tempForm
-            );
+            const tempForm = {}
+            tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
+            tempForm['good_id'] = val.selectedGoodInfo[i].id
+            tempForm['count'] = ''
+            tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
+            tempForm['remark'] = ''
+            this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
       }
 
-      this.currentIndex = -1;
+      this.currentIndex = -1
+
+      // this.$refs.dialog.hide();
+      // this.propForm.goodType = [];
+      // if (val.selectedGoodInfo.length > 0) {
+      //   for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
+      //     if (i == 0) {
+      //       this.recordInfo.recordData[this.currentIndex].good_type_id =
+      //         val.selectedGoodInfo[i].good_type_id;
+      //       this.recordInfo.recordData[this.currentIndex].good_id =
+      //         val.selectedGoodInfo[i].id;
+      //       this.recordInfo.recordData[
+      //         this.currentIndex
+      //       ].price = val.selectedGoodInfo[i].buy_price.toString();
+      //     } else {
+      //       console.log(val.selectedGoodInfo[i].buy_price.toString());
+      //       const tempForm = {};
+      //       tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
+      //       tempForm["good_id"] = val.selectedGoodInfo[i].id;
+      //       tempForm["count"] = "";
+      //       tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+      //       tempForm["remark"] = "";
+      //       this.recordInfo.recordData.splice(
+      //         this.currentIndex + 1,
+      //         0,
+      //         tempForm
+      //       );
+      //     }
+      //   }
+      // }
+      //
+      // this.currentIndex = -1;
     },
     cancle: function() {
       this.$refs.dialog.hide();
       this.propForm.goodType = [];
+      this.propForm.goods = []
+
     },
     GetConfigInfo: function() {
-      const params = {
-        type: this.$route.query.type
-      };
-      getSalesReturnConfig(params).then(response => {
+
+      GetAllConfig().then(response => {
         const loading = this.$loading({
           lock: true,
           text: "Loading",
@@ -331,42 +370,54 @@ export default {
           return false;
         } else {
           loading.close();
-          var warehouseInfoList = response.data.data.warehouseInfoList;
-          this.warehouseInfoList = response.data.data.warehouseInfoList;
-          for (let i = 0; i < warehouseInfoList.length; i++) {
-            if (warehouseInfoList[i].info.manufacturers.id > 0) {
-              this.manufacturer.push(warehouseInfoList[i].info.manufacturers);
-            }
-            if (warehouseInfoList[i].info.dealers.id > 0) {
-              this.dealer.push(warehouseInfoList[i].info.dealers);
-            }
-          }
-
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            this.goodType.push(this.warehouseInfoList[i].info.type);
-          }
-
-          const obj = {};
-          const obj2 = {};
-          const obj3 = {};
-          // 去重复
-          this.manufacturer = this.manufacturer.reduce((cur, next) => {
-            obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-          // 去重复
-          this.dealer = this.dealer.reduce((cur, next) => {
-            obj2[next.id] ? "" : (obj2[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-
-          this.goodType = this.goodType.reduce((cur, next) => {
-            obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
-            return cur;
-          }, []);
-
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          // var warehouseInfoList = response.data.data.warehouseInfoList;
+          // this.warehouseInfoList = response.data.data.warehouseInfoList;
+          // for (let i = 0; i < warehouseInfoList.length; i++) {
+          //   if (warehouseInfoList[i].info.manufacturers.id > 0) {
+          //     this.manufacturer.push(warehouseInfoList[i].info.manufacturers);
+          //   }
+          //   if (warehouseInfoList[i].info.dealers.id > 0) {
+          //     this.dealer.push(warehouseInfoList[i].info.dealers);
+          //   }
+          // }
+          //
+          // for (let i = 0; i < this.warehouseInfoList.length; i++) {
+          //   this.goodType.push(this.warehouseInfoList[i].info.type);
+          // }
+
+
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
+          this.goodType = response.data.data.goodType
+          this.goodInfo = response.data.data.goodInfo
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+          this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+          this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+          this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
+
+
+
+          // const obj = {};
+          // const obj2 = {};
+          // const obj3 = {};
+          // // 去重复
+          // this.manufacturer = this.manufacturer.reduce((cur, next) => {
+          //   obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+          //   return cur;
+          // }, []);
+          // // 去重复
+          // this.dealer = this.dealer.reduce((cur, next) => {
+          //   obj2[next.id] ? "" : (obj2[next.id] = true && cur.push(next));
+          //   return cur;
+          // }, []);
+          //
+          // this.goodType = this.goodType.reduce((cur, next) => {
+          //   obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
+          //   return cur;
+          // }, []);
+          //
+          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
       });
     },
@@ -380,13 +431,13 @@ export default {
       return name;
     },
     specificationName: function(good_info_id) {
-      let name = "";
-      for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-        if (this.propForm.goodInfo[i].id == good_info_id) {
-          name = this.propForm.goodInfo[i].specification_name;
+      let name = ''
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].specification_name
         }
       }
-      return name;
+      return name
     },
     handleEdit: function(index, row) {
       const tempObj = {};
@@ -423,136 +474,65 @@ export default {
       }
     },
     showDialog(index, row) {
-      this.currentIndex = index;
-      this.propForm.goodType = [];
-      this.propForm.goods = [];
-
-      if (this.form.manufacturer == -1 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseInfoList[i].info.dealers.id == 0 &&
-            this.warehouseInfoList[i].info.manufacturers.id == 0
-          ) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
-
-      if (this.form.manufacturer == -1 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
-
-      if (this.form.manufacturer == -1 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseInfoList[i].info.manufacturers.id == 0 &&
-            this.warehouseInfoList[i].info.dealers.id == this.form.dealer
-          ) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.currentIndex = index
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
       }
+      GetAllGoodInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+            loading.close()
 
-      if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-          this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-        }
-      }
+          } else {
+            loading.close()
 
-      if (this.form.manufacturer == 0 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (this.warehouseInfoList[i].info.dealers.id == 0) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error('该厂商或经销商没有物品信息')
+              return
+            }
+            this.$refs.dialog.show()
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+            }
+            const obj = {}
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
           }
-        }
-      }
 
-      if (this.form.manufacturer != 0 && this.form.dealer == -1) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseInfoList[i].info.dealers.id == 0 &&
-            this.warehouseInfoList[i].info.manufacturers.id ==
-              this.form.manufacturer
-          ) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = []
+            let goodObj = {}
 
-      if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseInfoList[i].info.manufacturers.id ==
-              this.form.manufacturer &&
-            this.warehouseInfoList[i].info.dealers.id == this.form.dealer
-          ) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a]
+              respObj['isSelected'] = false
+              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj)
+              }
+            }
+            const obj = {}
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-      if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
-      if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (
-            this.warehouseInfoList[i].info.manufacturers.id ==
-            this.form.manufacturer
-          ) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type);
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info);
-          }
-        }
-      }
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+            this.propForm.goods.push(goodObj)
 
-      const obj3 = {};
-      this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
-        return cur;
-      }, []);
-      const obj4 = {};
-      this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-        obj4[next.id] ? "" : (obj4[next.id] = true && cur.push(next));
-        return cur;
-      }, []);
-
-      for (let i = 0; i < this.propForm.goodType.length; i++) {
-        let goodInfo = [];
-        let goodObj = {};
-
-        for (let a = 0; a < this.propForm.goodInfo.length; a++) {
-          var respObj = this.propForm.goodInfo[a];
-          respObj["isSelected"] = false;
-          if (respObj.type.id == this.propForm.goodType[i].id) {
-            goodInfo.push(respObj);
           }
+          console.log( this.propForm.goods)
         }
-        const obj = {};
-        goodInfo = goodInfo.reduce((cur, next) => {
-          obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-          return cur;
-        }, []); // 设置cur默认类型为数组，并且初始值为空的数组
-
-        this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
-        this.propForm.goods.push(goodObj);
-      }
+      )
 
       this.$refs.dialog.show();
     },

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -13,10 +13,21 @@
 
     <div class="app-container">
 
-      <sales-return-dialog ref="dialog" :propForm="propForm"
-                           :visibility="isVisibility"
-                           v-on:dialog-comfirm="comfirm"
-                           v-on:dialog-cancle="cancle"></sales-return-dialog>
+      <!--<stock-in-dialog-->
+        <!--ref="dialog"-->
+        <!--:propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <stock-in-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+      </stock-in-dialog>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
@@ -159,12 +170,12 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
+  import StockInDialog from './Dialog/stockInDialog'
 
   export default {
-    components: { BreadCrumb, SalesReturnDialog },
+    components: { StockInDialog, BreadCrumb},
     name: 'salesReturnEdit',
 
     data() {
@@ -224,117 +235,86 @@
         warehouseOut: {},
         manufacturer: [],
         dealer: [],
-        goodType: []
+        goodType: [],
+        goodInfo:[],
       }
     },
     methods: {
       comfirm: function(val) {
-        this.$refs.dialog.hide()
+        this.$refs.dialog.hide();
+        this.propForm.goodType = [];
+        this.propForm.goods = [];
 
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1;i >= 0 ; i--) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-
+              this.recordInfo.recordData[this.currentIndex].good_type_id =
+                val.selectedGoodInfo[i].good_type_id;
+              this.recordInfo.recordData[this.currentIndex].good_id =
+                val.selectedGoodInfo[i].id;
+              this.recordInfo.recordData[
+                this.currentIndex
+                ].price = val.selectedGoodInfo[i].buy_price.toString();
             } else {
-              const tempForm = {}
-              tempForm['id'] = 0
-              tempForm['good_type_id'] = val.selectedGoodInfo[i].good_type_id
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
-              tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
-
-              tempForm['remark'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+              const tempForm = {};
+              tempForm["id"] = 0;
+              tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
+              tempForm["good_id"] = val.selectedGoodInfo[i].id;
+              tempForm["count"] = "";
+              tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+              tempForm["remark"] = "";
+              this.recordInfo.recordData.splice(
+                this.currentIndex + 1,
+                0,
+                tempForm
+              );
             }
           }
         }
-
-        this.currentIndex = -1
-      }, cancle: function() {
+        this.currentIndex = -1;
+      },
+      cancle: function() {
         this.$refs.dialog.hide()
-      }, GetConfigInfo: function() {
-        const params = {
-          type: this.$route.query.type
-        }
-        getSalesReturnConfig(params).then(response => {
-          const loading = this.$loading({
-            lock: true,
-            text: 'Loading',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          })
+        this.propForm.goods = [];
 
+        this.propForm.goodType = [];
+      }, GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        GetAllConfig().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
+            this.$message.error(response.data.msg);
+            return false;
           } else {
-            loading.close()
-            var warehouseInfoList = response.data.data.warehouseInfoList
-            this.warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              if (warehouseInfoList[i].info.manufacturers.id > 0) {
-                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
-              }
-              if (warehouseInfoList[i].info.dealers.id > 0) {
-                this.dealer.push(warehouseInfoList[i].info.dealers)
-              }
-            }
-
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.goodType.push(this.warehouseInfoList[i].info.type)
-            }
-
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-            const obj = {}
-            const obj2 = {}
-            const obj3 = {}
-
-            const obj4 = {}
-            // 去重复
-            this.manufacturer = this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            // 去重复
-            this.dealer = this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-            this.goodType = this.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
-            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
-
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            this.goodType = response.data.data.goodType;
+            this.goodInfo = response.data.data.goodInfo;
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
-        })
+          loading.close();
+        });
       }, typeName: function(good_type_id) {
-        let name = ''
+        let name = "";
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
-            name = this.goodType[i].type_name
+            name = this.goodType[i].type_name;
           }
         }
-        return name
+        return name;
       }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name;
           }
         }
-        return name
+        return name;
       }, handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['id'] = 0
@@ -351,7 +331,7 @@
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
+          this.$confirm('确认删除该出库商品信息记录?', '删除出库商品信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -375,132 +355,70 @@
         } else {
           return ''
         }
-      }, showDialog(index, row) {
-        this.currentIndex = index
-        this.propForm.goodType = []
-        this.propForm.goods = []
-
-        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-          }
-        }
-
-        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-
-            }
-          }
-        }
-
-        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+      },
+      showDialog(index, row) {
+        this.currentIndex = index;
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
 
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        };
+        GetAllGoodInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error("该厂商或经销商没有物品信息");
+              return;
             }
-          }
-        }
-        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-          for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            this.$refs.dialog.show();
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodType.push(
+                response.data.data.goodInfo[i].GoodsType
+              );
             }
+            const obj = {};
+            this.propForm.goodType = this.propForm.goodType.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
           }
-        }
-
-
-        const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-        const obj4 = {}
-        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-
 
           for (let i = 0; i < this.propForm.goodType.length; i++) {
-            let goodInfo = []
-            let goodObj = {}
-
-            for (let a = 0; a < this.propForm.goodInfo.length; a++) {
-              var respObj = this.propForm.goodInfo[a]
-              respObj['isSelected'] = false
-              if (respObj.type.id == this.propForm.goodType[i].id) {
-                goodInfo.push(respObj)
+            let goodInfo = [];
+            let goodObj = {};
+
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a];
+              respObj["isSelected"] = false;
+              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj);
               }
             }
-            const obj = {}
+            const obj = {};
             goodInfo = goodInfo.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            }, []); // 设置cur默认类型为数组，并且初始值为空的数组
 
-            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
-            this.propForm.goods.push(goodObj)
-
-        }
-        this.$refs.dialog.show()
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
+            this.propForm.goods.push(goodObj);
+          }
+          loading.close();
+        });
+      },
 
-      }, back() {
+      back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {

src/xt_pages/stock/stockQuery.vue

@@ -182,13 +182,10 @@ export default {
           this.WarehouseInfo.loading = false;
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-            if (response.data.data.list[i].query_warehousing_info.length > 0) {
+
               this.WarehouseInfo.warehouseInfoDate.push(
                 response.data.data.list[i]
               );
-            } else {
-              this.total = this.total - 1;
-            }
           }
         }
       });

src/xt_pages/stock/stockUserDetail.vue

@@ -38,12 +38,20 @@
               <span v-if="scope.row.is_total == 1"></span>
             </template>
           </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span >{{scope.row.count}}</span>
+            </template>
+          </el-table-column>
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>
             </template>
             <template slot-scope="scope">
-              <span  v-if="scope.row.is_total == 0">{{scope.row.record_time | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
               <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
             </template>
           </el-table-column>
@@ -105,15 +113,16 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-
+            var total = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               var obj = response.data.data.list[i]
               obj['is_total'] = 0
               this.userList.push(obj)
+              total = total + response.data.data.list[i].count
             }
             this.userList.push({
               is_total: 1,
-              total: response.data.data.total,
+              total: total,
             })
 
             console.log(this.userList)