其他入库

src/views/basicData/goods/index.vue

@@ -82,6 +82,15 @@
           >
           </el-switch>
         </template>
+        <template v-slot:isuse="scope">
+          <el-switch
+            v-model="scope.row.isuse"
+            active-value="1"
+            inactive-value="0"
+            @change="onChangeSwitch($event, scope.row)"
+          >
+          </el-switch>
+        </template>
       </heavy-table>
 
       <div style="height: 80px"></div>

src/views/taskManagement/index.vue

@@ -570,9 +570,10 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      this.form.taskPath = this.$refs['form'].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.title === '修改任务') {
+            this.form.taskPath = this.form.toSide
             updateBusInDataTask(this.form).then((response) => {
               this.$modal.msgSuccess('修改成功')
               this.open = false

src/views/warehousing/otherStore/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="app-container">
+    <div>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="入库仓库">
+          <el-select
+            style="width: 500px"
+            v-model="form.no"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in WarehousingList"
+              :key="item.id"
+              :label="item.branchName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料信息">
+          <div v-if="chooselist.length>0">
+            <div v-for="(item,index) in chooselist" :key="index" style="margin-top: 10px">
+              <span>{{ item.goodName+'-'+item.goodsNo+'-'+item.specifications }}</span>
+              <el-input v-model="item.qty" style="width: 100px;margin-left: 50px" placeholder="入库数量"></el-input>
+            </div>
+          </div>
+          <el-button style="margin-top: 20px" @click="dialogVisible = true">选择物料</el-button>
+        </el-form-item>
+        <el-form-item label="容器编码">
+          <el-input style="width: 500px" v-model="form.containerNo" placeholder="请扫描或录入容器编码"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">确认入库</el-button>
+          <el-button @click="reset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--物料选择-->
+    <el-dialog
+      title="选择物料"
+      :visible.sync="dialogVisible"
+      width="50%">
+      <div style="display: flex">
+        <div>
+          <el-dropdown @command="handleCommand">
+            <span class="el-dropdown-link">
+              物料分类<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="110">成品</el-dropdown-item>
+              <el-dropdown-item command="100">铝合金锭</el-dropdown-item>
+              <el-dropdown-item command="101">锌合金锭</el-dropdown-item>
+              <el-dropdown-item command="111">模具配件</el-dropdown-item>
+              <el-dropdown-item command="102">配件</el-dropdown-item>
+              <el-dropdown-item command="108">辅料</el-dropdown-item>
+              <el-dropdown-item command="101">模具</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+        <div style="margin-left: 50px">
+          <div class="search-box customer-search">
+            <el-form
+              :inline="true"
+              :model="searchForm"
+              ref="searchForm"
+            >
+              <el-form-item
+                prop="orderNo"
+              >
+                <el-input
+                  v-model="searchForm.goodNo"
+                  placeholder="请输入商品编码"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item
+                prop="orderNo"
+              >
+                <el-input
+                  v-model="searchForm.goodName"
+                  placeholder="请输入商品名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item
+                prop="orderNo"
+              >
+                <el-input
+                  v-model="searchForm.mnemonic"
+                  placeholder="请输入助记码"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item style="margin-left: 15px">
+                <el-button style="margin-left: 10px" size="small" type="primary" @click="searchList()">搜索</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div
+            class="layout-full"
+            style="padding-top: 42px"
+          >
+            <heavy-table
+              :data="tableData"
+              :tableProps="tableProps"
+              :config="config"
+              :loading="loading"
+              @current-change="queryTable"
+              :paging="paging"
+              @handleselection="handleselection"
+            >
+              <template v-slot:errMsg="scope">
+                {{
+                  scope.row.errMsg === "ERROR"
+                    ? scope.row.errMsg + "?"
+                    : scope.row.errMsg
+                }}
+              </template>
+            </heavy-table>
+
+          </div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+<!--        <el-button>已选：D23.145.36.7 钢管外丝1寸；D29.182.12.8 回炉料3#</el-button>-->
+        <el-button @click="cancel()">取 消</el-button>
+        <el-button type="primary" @click="choose()">确认选择</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {dealEmptyQueryCondition, getDictLabel} from "@/utils";
+import {getBranchList, InitInOrder} from "@/api/system/branch";
+import {getGoods} from "@/api/basicData/goods";
+export default {
+  name: "index",
+  dicts: ["goods_classify"],
+  data() {
+    const _that=this
+    return {
+      form:{},
+      dialogVisible: false,
+      searchForm:{
+
+      },
+      tableData: [
+        {
+          goodNo:1,
+          goodName:'shh'
+        },
+        {
+          goodNo:2,
+          goodName:'cdgf'
+        }],
+      tableProps:{},
+      config: [
+        // 表头数据
+        { label: "复选框", type: "selection", prop: "selection", istrue: true },
+        {
+          label: '商品编号',
+          prop: 'goodNo',
+          width: 160,
+          istrue: true
+        },
+        {
+          label: '商品名称',
+          prop: 'goodName',
+          width: 150,
+          istrue: true
+        },
+        {
+          label: '规格',
+          prop: 'specifications',
+          istrue: true
+        },
+        {
+          label: '型号',
+          prop: '',
+          istrue: true
+        },
+        {
+          label: '所属分类',
+          prop: 'specialMana',
+          istrue: true,
+          filter(row, value) {
+            return getDictLabel(value, _that.dict.type.goods_classify);
+          },
+        },
+      ],
+      loading: false,
+      paging: {
+        page: 1, // 当前页
+        size: 10, // 页面大小
+        total: 0
+      },
+      WarehousingList:[],
+      handleSelect:[],
+      chooselist:[]
+    };
+  },
+  mounted() {
+    this.getBranchList()
+    this.queryTable()
+  },
+  methods: {
+    // 仓库列表
+    getBranchList(){
+      getBranchList().then((res)=>{
+        this.WarehousingList=res.rows
+      })
+    },
+    // 商品列表
+    async queryTable() {
+      this.loading = true
+      const request = {
+        ...this.searchForm,
+        pageSize: this.paging.size,
+        pageNum: this.paging.page
+      }
+      dealEmptyQueryCondition(request)
+      const { rows, total } = await getGoods(request)
+      this.tableData = rows
+      this.paging.total = total
+      this.loading = false
+    },
+    // 确定入库
+    onSubmit(){
+      if(!this.form.no){
+        this.$message.error('请选择入库仓库！')
+        return;
+      }
+      const obj={
+        no:this.form.no,
+        orderType:11,
+        containerNo:this.form.containerNo,
+        detail:this.chooselist
+      }
+      // console.log('确定入库',obj)
+      InitInOrder(obj).then((res)=>{
+        console.log(res)
+      })
+    },
+    // 重置
+    reset(){
+      this.form={}
+      this.chooselist=[]
+    },
+    //商品分类
+    handleCommand(command) {
+      this.$message('click on item ' + command);
+    },
+    // 复选框
+    handleselection(row){
+      this.handleSelect = row
+    },
+    // 选择商品
+    choose(){
+      this.chooselist=[]
+      this.handleSelect.forEach((item)=>{
+        let newItem={
+          lineId:0,
+          goodsNo:item.goodNo,
+          goodName:item.goodName,
+          specifications:item.specifications,
+          unitMsr:'kg',
+          warehouseNo:102
+        }
+        this.chooselist.push(newItem)
+      })
+      this.searchForm={}
+      this.dialogVisible = false
+    },
+    // 取消选择
+    cancel(){
+      this.searchForm={}
+      this.dialogVisible = false
+    },
+    // 商品列表条件查询
+    searchList(){
+      this.paging.page=1
+      this.queryTable()
+    }
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409EFF;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+</style>

src/views/wcs/base/AGV/index.vue

@@ -152,7 +152,25 @@
 
           </el-select>
         </el-form-item>
+        <el-form-item
+          label="是否占用"
+          prop="isActive"
+        >
+          <el-select
+            v-model="form.isOccupy"
+            placeholder="请选择"
+            style="width: 100%;"
+            clearable
+          >
+            <el-option
+              v-for="item in dict.type.is_use"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
 
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="选择设备"
           prop="devName"