Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/Approval/list.vue

@@ -71,7 +71,7 @@ export default {
           ]
         },
       
-        // { title: '审批时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
+        { title: '提交时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
       ],
       tableColums: [
         { type: 'selection', align: 'center', fixed: 'left', minWidth: 100, },

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -155,9 +155,11 @@
           >
             <div slot="content">
               <div>
+                <div v-if="warehouse.length !=0">
                 <div v-for="(_item,_index) in warehouse" :key="_index">
                   {{_item.warehouse_title}}:{{_item.num}}
-                </div>
+                </div></div>
+                <span v-else>空</span>
               </div>
             </div>
             <Input

src/views/PurchasingManage/OutstockOrder/edit.vue

@@ -75,6 +75,21 @@
           </Input>
           <span v-show="isCheck">{{searchData.title}}</span>
         </FormItem>
+        <FormItem label='仓库'>
+          <Select v-model="searchData.warehouse_type"
+                  size="small"
+                  clearable
+                  filterable
+                  v-show="!isCheck"
+                  label-in-value
+                  style="width: 200px">
+            <Option v-for="(sitem) in warehouse_type"
+                    :key="sitem.id"
+                    :label="sitem.title"
+                    :value="sitem.id">
+            </Option>
+          </Select>
+        </FormItem>
         <FormItem label="单据号:">
           <Input
             type="text"
@@ -94,6 +109,19 @@
                  style="width: 200px"
                  placeholder="制单人" />
         </FormItem> -->
+        <FormItem label='出库类型'>
+           <Select v-model="searchData.type_id"
+                  size="small"
+                  clearable
+                  v-show="!isCheck"
+                  style="width: 200px">
+            <Option v-for="(sitem) in out_stock_type"
+                    :key="sitem.id"
+                    :label="sitem.title"
+                    :value="sitem.id">
+            </Option>
+          </Select>
+        </FormItem>
         <FormItem label="制单日期:">
           <DatePicker
             type="date"
@@ -121,7 +149,7 @@
     <div class="content_table">
       <div class="content_table_btn">
         <div>
-          <span>请购清单</span>
+          <span>出库清单</span>
           <Button
             @click="showModal = true"
             type="primary"
@@ -352,6 +380,9 @@ export default {
   data() {
     // 这里存放数据
     return {
+      out_stock_type:[{id:0,title:'未出库'},
+                            {id:1,title:'已出库'}],
+      warehouse_type:[],
       isCheck:false,
       is_refer:'',
       btn_disable:false,
@@ -360,6 +391,7 @@ export default {
       fax_modify: "",
       searchData: {
         residential_name: "",
+        warehouse_type:''
       },
       modalProjectData: {
         title: "",
@@ -711,6 +743,10 @@ export default {
         this.modalData.treeData[0].list = res.data;
       })
       .catch((err) => {});
+    //获取仓库列表
+    this.axios({method:'get',url:'/api/warehouse_type'}).then((res)=>{
+        this.warehouse_type = res.data;
+    })
     // 获取供应商列表
     this.axios({ method: "get", url: "/api/supply_list" })
       .then((res) => {

src/views/Warehouse/Approval/list.vue

@@ -69,7 +69,7 @@ export default {
           ]
         },
       
-        // { title: '审批时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
+        { title: '提交时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
       ],
       tableColums: [
         { type: 'selection', align: 'center', fixed: 'left', minWidth: 100, },

src/views/Warehouse/Warehouse/stockingTable.vue

@@ -314,7 +314,7 @@ export default {
     },
     handleSelectionChange (selection) { this.submitData = selection },
     //审核、弃审  2编辑
-    handleSet (row, index, type) {
+    handleSet (row, type) {
       switch (type) {
         case 1:
           // 1入库 2出库

src/views/Warehouse/Warehouse/stockingTableEdit.vue

@@ -27,6 +27,21 @@
              show
              show-summary
              border>
+             <template slot="num" slot-scope="{row}">
+                        <Tooltip
+            placement="left"
+            @on-popper-show="handleToolShow(index, row)"
+          >
+            <div slot="content">
+              <div>
+                <div v-for="(_item,_index) in warehouse" :key="_index">
+                  {{_item.warehouse_title}}:{{_item.num}}
+                </div>
+              </div>
+            </div>
+            <span >{{ row.num }}</span>
+          </Tooltip>
+             </template>
       </Table>
     </div>
   </div>
@@ -54,10 +69,11 @@ export default {
           }
         },
         { title: '计量单位', align: 'center', key: 'unit', minWidth: 100, },
-        { title: this.$route.query.type == 1 ? '入库数量' : '出库数量', align: 'center', key: 'num', minWidth: 100 },
+        { title: this.$route.query.type == 1 ? '入库数量' : '出库数量', align: 'center', key: 'num', minWidth: 100,slot:'num' },
       ],
       tableData: [],
       order_no: '',
+      warehouse:''
     }
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -68,6 +84,24 @@ export default {
   created () {
   },
   methods: {
+      handleToolShow(index, row) {
+      if (this.warehouse) {
+        return
+      } else {
+        this.axios
+          .get("/api/warehouse_stock_number", {
+            params: {
+              material_id: row.material_id,
+              material_detail_id: row.material_detail_id,
+            },
+          })
+          .then((res) => {
+              this.warehouse= res.data
+          });
+      }
+      // this.warehouse.num = this.warehouseTotal[index].num;
+      // this.warehouse.warehouseName = this.warehouseTotal[index].warehouseName
+    },
     initData () {
       if (this.$route.query.type == 1) {
         this.axios({

src/views/leadMatch/MatchList/matchCheck.vue

@@ -98,6 +98,7 @@
                 @click="handleGoProduction(matched_info)"
                 type="primary"
                 size="small"
+                :disabled='(matched_info.matching_status == 0||matched_info.matching_status == 1)?true:false'
                 >下生产</Button
               >
             </span>

src/views/leadMatch/MatchList/matchPage.vue

@@ -486,7 +486,7 @@
                 <Checkbox
                   v-model="matched_info.isSelect"
                   @on-change="handleMatchedSelectAll"
-                  >全选</Checkbox
+                  >选择</Checkbox
                 >
               </Col>
               <Col span="2">

src/views/leadMatch/roomList/edit.vue

@@ -67,7 +67,7 @@
               <span>图号：{{item.url_number}}</span>
               <span>产品名称：{{item.product_title}}</span>
               <span>批量数：{{item.number}}</span>
-              <span :style="item.state == 1?'':'color:red;'">{{item.state == 0?'未匹配':item.state == 1?'匹配完成':'匹配中'}}</span>
+              <span :style="item.state == 1?'':'color:red;'">{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>
             </div>
             <div class="table_header_right">
               <Button type="primary" size="small" :disabled="item.state==0?false:true" @click="del(item,index)" v-if="$route.query.type!=2">删除</Button>

src/views/leadMatch/weightMemo/edit.vue

@@ -69,7 +69,7 @@
                 <span>批量数：{{item.number}}</span>
               <span :style="item.state == 1?'':'color:red;'"
                     v-if="$route.query.type != 3"
-                    >{{item.state == 0?'未匹配':item.state == 1?'匹配完成':'匹配中'}}</span>
+                    >{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>
             </div>
             <div class="table_header_right">
               <Button type="primary" size="small" :disabled="item.state==0?false:true" @click="del(item,index)" v-if="$route.query.type!=2">删除</Button>