代码备份

src/views/basic/workplace/addBusTypeDialog.vue

@@ -5,7 +5,7 @@
     >
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
-          <el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
+          <el-form-item label="所属工位:" prop="workplaceName" class="query-form-item">
             <el-input
               disabled
               v-model="busData.workplaceName" style="width: 80%"
@@ -13,16 +13,6 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12" class="el-col">
-          <el-form-item label="业务名称:" prop="busName" class="query-form-item">
-            <el-input
-              v-model="formData.busName" style="width: 80%"
-              auto-complete="off"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="是否配套系统:" prop="isMatching" class="query-form-item">
             <el-select v-model="formData.isMatching" style="width: 80%" placeholder="选择扫码方式"
@@ -33,10 +23,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+      </el-row>
+      <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="单据类型:" prop="documentTypeCode" class="query-form-item">
             <el-select v-model="formData.documentTypeCode" placeholder="请选择单据类型"
                        style="width: 80%"
+                       @change="documentTypeChange"
             >
               <el-option
                 v-for="item in busTypes"
@@ -49,8 +43,36 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="业务名称:" prop="busName" class="query-form-item">
+            <el-input
+              v-model="formData.busName" style="width: 80%"
+              auto-complete="off"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
       </el-row>
+      <el-row :gutter="24" class="el-row">
+        <el-col :span="12" class="el-col">
+          <el-form-item label="出入库方式:" prop="documentTypeCode" class="query-form-item">
+            <el-select v-model="formData.inoutType" style="width: 80%" placeholder="选择出入库方式"
+            >
+              <el-option label="入库" :value="1"></el-option>
+              <el-option label="出库" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="计量单位:" prop="orderCirType" class="query-form-item">
+            <el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择计量单位">
+              <el-option label="流通计量单位" :value="1"></el-option>
+              <el-option label="使用计量单位" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
+      </el-row>
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
@@ -63,11 +85,9 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-
         <el-col :span="12" class="el-col">
           <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
-            <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable
+            <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式"
                        :disabled="formData.scanType == 1"
             >
               <el-option label="自动添加" :value="1"></el-option>
@@ -88,12 +108,20 @@
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="12" class="el-col">
-          <el-form-item label="单据流通方式:" prop="orderCirType" class="query-form-item">
-            <el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择单据流通方式">
-              <el-option label="配送流通" :value="1"></el-option>
-              <el-option label="出库使用" :value="2"></el-option>
+          <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
+            <el-select v-model="formData.invCode" placeholder="请选择仓库"
+                       style="width: 80%"
+                       clearable
+            >
+              <el-option
+                v-for="item in invList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code"
+              >
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -102,11 +130,14 @@
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
-            <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型">
-              <el-option label="客户" :value="1"></el-option>
+            <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
+                       @change="corpTypeChange"
+            >
               <el-option label="供应商" :value="2"></el-option>
-              <el-option label="内部科室" :value="3"></el-option>
+              <el-option label="客户" :value="1"></el-option>
               <el-option label="特殊往来" :value="4"></el-option>
+              <el-option label="内部科室" :value="3"></el-option>
+              <el-option label="填写" :value="5"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -122,23 +153,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="el-row">
-        <el-col :span="12" class="el-col">
-          <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
-            <el-select v-model="formData.invCode" placeholder="请选择仓库"
-                       style="width: 80%"
-                       clearable
-            >
-              <el-option
-                v-for="item in invList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.code"
-              >
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+
       </el-row>
       <!--<el-col :span="12" class="el-col">-->
       <!--  <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
@@ -210,7 +225,10 @@ export default {
         scanType: 1,
         checkInsert: 1,
         isMatching: 1,
-        documentTypeCode: null
+        inoutType: null,
+        documentTypeCode: null,
+        orderCirType: 1,
+        warnType: 2,
       },
       invList: [],
       busTypes: [],
@@ -236,12 +254,12 @@ export default {
         orderCirType: [
           {required: true, message: '请选择单据流通方式', trigger: 'blur'}
         ],
-        corpType: [
-          // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
-        ],
-        unitTittle: [
-          // { required: true, message: '请输入往来类型标题', trigger: 'blur' }
-        ],
+        // corpType: [
+        //   // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
+        // ],
+        // unitTittle: [
+        //   // { required: true, message: '请输入往来类型标题', trigger: 'blur' }
+        // ],
       }
     }
   },
@@ -285,6 +303,35 @@ export default {
         this.getBusTypeList()
       }
     },
+
+    documentTypeChange(val) {
+      if (this.formData.isMatching == 0) {
+
+        let matchingItem = this.busTypes.find(item => item.code == val);
+        this.formData = {...this.formData, busName: matchingItem.name}
+      } else {
+        let matchingItem = this.busTypes.find(item => item.code == val);
+        this.formData = {...this.formData, busName: matchingItem.name}
+      }
+    },
+    corpTypeChange(value) {
+      switch (value) {
+        case 1:
+          this.formData.unitTittle = "客户"
+          break;
+        case 2:
+          this.formData.unitTittle = "供应商"
+          break;
+        case 3:
+          this.formData.unitTittle = "内部科室"
+          break;
+        case 4:
+          this.formData.unitTittle = "特殊往来"
+          break;
+        case 5:
+          break;
+      }
+    },
     getBusTypeList() {
       let query = {
         enable: 1,
@@ -307,7 +354,8 @@ export default {
           this.$message.error('获取错误')
         }
       })
-    },
+    }
+    ,
     formSubmit() {
       this.formData.workplaceCode = this.workplaceId
       if (this.upData != null) {
@@ -330,18 +378,18 @@ export default {
                 this.$message.error('新增失败')
               }
             })
-          } else {
-
           }
         })
         // this.formData
 
       }
 
-    },
+    }
+    ,
     hideForm() {
       this.closeDialog()
-    },
+    }
+    ,
     // 当scanType改变时调用此方法来更新校验规则
     updateFormRules() {
       if (this.formData.scanType === 1) {
@@ -353,12 +401,16 @@ export default {
         this.$set(this.formRules.corpType, 0, {required: true, message: '请选择往来单位类型', trigger: 'blur'});
         this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
       }
-    },
+    }
+    ,
     changeCheckInsert() {
-      if (this.formData.operationType == 1) {
+      if (this.formData.scanType == 1) {
         this.formData.checkInsert = 1
+      } else {
+        this.formData.checkInsert = 2
       }
-    },
+    }
+    ,
   },
   watch: {
     // 监听scanType的变化，以更新校验规则

src/views/basic/workplace/workplaceManage.vue

@@ -3,7 +3,7 @@
     <el-card>
       <el-row type="flex">
         <el-col style="flex: 1" v-show="Dictionary">
-          <el-col v-if="showSearch" style="min-width: 300px; max-width: 100%">
+          <el-col v-if="showSearch" style="min-width: 200px; max-width: 100%">
             <el-tree
               :data="treeList"
               class="tree"
@@ -26,10 +26,10 @@
                   新增
                 </el-button>
                 <el-button
+                  v-if="data.parentCode != null"
                   type="text"
                   size="mini"
                   style="margin-left: 10px"
-                  :disabled="data.parentCode == null"
                   @click="() => append(data, 'edit')"
                 >
             编辑
@@ -37,14 +37,13 @@
           <el-button
             type="text"
             size="mini"
-            :disabled="data.parentCode == null"
+            v-if="data.parentCode != null"
             @click="delTree(data)"
           >
             删除
           </el-button>
 
-              </span
-              >
+              </span>
             </el-tree>
           </el-col>
         </el-col>
@@ -108,24 +107,26 @@
               <el-table-column type="index" label="序号"></el-table-column>
               <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
               <el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
-              <!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
-              <!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
-              <!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
-              <!--<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>-->
-              <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
-              <!--<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>-->
               <el-table-column label="工位类型" prop="workplaceType" width="90">
                 <template slot-scope="scope">
                   <span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
               <el-table-column label="工位状态" prop="workplaceStatus" width="90">
                 <template slot-scope="scope">
                   <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
                 </template>
               </el-table-column>
+              <!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
+              <!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
+              <!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
+              <!--<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>-->
+              <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
+              <!--<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>-->
+
               <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
-              <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
+
               <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
               <el-table-column label="备注" prop="remake" width="140"></el-table-column>
               <el-table-column label="操作" fixed="right" width="160">
@@ -163,61 +164,7 @@
           <!--<el-card>-->
           <el-tabs type="border-card" style="margin: 15px">
             <el-tab-pane>
-              <span slot="label">{{ workplaceName }}-用户列表</span>
-              <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
-                       style="margin-bottom: 10px"
-              >
-                <el-form-item class="query-form-item" label="用户账号/用户名称:">
-                  <el-input
-                    v-model="userQuery.userKey"
-                    placeholder="请输入用户账号/名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item>
-                  <el-button-group>
-                    <el-button
-                      type="primary"
-                      icon="el-icon-refresh"
-                      @click="onUserReset"
-                    >重置
-                    </el-button>
-                    <el-button type="primary" @click="loadUserList"
-                               icon="el-icon-search"
-                    >查询
-                    </el-button
-                    >
-                  </el-button-group>
-                </el-form-item>
-              </el-form>
-
-              <el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }"
-                        highlight-current-row
-              >
-                <el-table-column type="index" label="序号"></el-table-column>
-                <el-table-column label="用户账号" prop="userName"></el-table-column>
-                <el-table-column label="用户名称" prop="employeeName"></el-table-column>
-                <el-table-column label="备注" prop="remark"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="50">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      size="small"
-                      @click.native.stop="removeUser(scope.row)"
-                    >移除
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <pagination
-                :total="userTotal"
-                :limit.sync="userQuery.limit"
-                :page.sync="userQuery.page"
-                @pagination="getUserBindWork(userQuery)"
-              >
-              </pagination>
-            </el-tab-pane>
-            <el-tab-pane>
+              <!--              {{ workplaceName }}--->
               <span slot="label">{{ workplaceName }}-业务类型</span>
               <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
@@ -254,40 +201,46 @@
                         highlight-current-row
               >
                 <el-table-column type="index" label="序号"></el-table-column>
-                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>
-                <el-table-column label="业务名称 " prop="busName"></el-table-column>
-                <el-table-column label="仓库名称 " prop="invName"></el-table-column>
-                <el-table-column label="是否配套系统" prop="isMatching" width="100">
+                <!--                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>-->
+                <el-table-column label="业务名称 " prop="busName" width="160"></el-table-column>
+                <el-table-column label="配套系统" prop="isMatching" width="100">
                   <template slot-scope="scope">
                     <span>{{ isMatchings[scope.row.isMatching] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="扫码方式" prop="scanType">
+                <el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
+                <el-table-column label="出入库" prop="inoutType" width="100">
                   <template slot-scope="scope">
-                    <span>{{ operationTypes[scope.row.scanType] }}</span>
+                    <span>{{ inoutTypes[scope.row.inoutType] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="处理结果 " prop="checkInsert">
+                <el-table-column label="计量单位 " prop="orderCirType" width="100">
                   <template slot-scope="scope">
-                    <span>{{ checkInserts[scope.row.checkInsert] }}</span>
+                    <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="单据流通方式 " prop="orderCirType" width="100">
+                <el-table-column label="扫码方式" prop="scanType" width="120">
                   <template slot-scope="scope">
-                    <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
+                    <span>{{ operationTypes[scope.row.scanType] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="异常方式提醒" prop="warnType" width="100">
+                <el-table-column label="处理结果 " prop="checkInsert" width="120">
                   <template slot-scope="scope">
-                    <span>{{ warnTypeMap[scope.row.warnType] }}</span>
+                    <span>{{ checkInserts[scope.row.checkInsert] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="往来单位类型" prop="corpType" width="100">
+                <el-table-column label="异常方式提醒" prop="warnType" width="100">
                   <template slot-scope="scope">
-                    <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+                    <span>{{ warnTypeMap[scope.row.warnType] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>
+                <!--                <el-table-column label="往来单位类型" prop="corpType" width="100">-->
+                <!--                  <template slot-scope="scope">-->
+                <!--                    <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
+                <!--                <el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>-->
+                <!--                <el-table-column label="默认仓库 " prop="invName"></el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="120">
                   <template slot-scope="scope">
                     <el-button
@@ -300,7 +253,7 @@
                       type="text"
                       size="small"
                       @click.native.stop="removeBusType(scope.row)"
-                    >移除
+                    >删除
                     </el-button>
                   </template>
                 </el-table-column>
@@ -313,6 +266,61 @@
               >
               </pagination>
             </el-tab-pane>
+            <el-tab-pane>
+              <span slot="label">{{ workplaceName }}-用户列表</span>
+              <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
+                       style="margin-bottom: 10px"
+              >
+                <el-form-item class="query-form-item" label="用户账号/用户名称:">
+                  <el-input
+                    v-model="userQuery.userKey"
+                    placeholder="请输入用户账号/名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item>
+                  <el-button-group>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-refresh"
+                      @click="onUserReset"
+                    >重置
+                    </el-button>
+                    <el-button type="primary" @click="loadUserList"
+                               icon="el-icon-search"
+                    >查询
+                    </el-button
+                    >
+                  </el-button-group>
+                </el-form-item>
+              </el-form>
+
+              <el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }"
+                        highlight-current-row
+              >
+                <el-table-column type="index" label="序号"></el-table-column>
+                <el-table-column label="用户账号" prop="userName"></el-table-column>
+                <el-table-column label="用户名称" prop="employeeName"></el-table-column>
+                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="50">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click.native.stop="removeUser(scope.row)"
+                    >移除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                :total="userTotal"
+                :limit.sync="userQuery.limit"
+                :page.sync="userQuery.page"
+                @pagination="getUserBindWork(userQuery)"
+              >
+              </pagination>
+            </el-tab-pane>
           </el-tabs>
 
         </el-col>
@@ -461,7 +469,7 @@
           <el-col :span="12" class="el-col">
             <el-form-item label="备注:" prop="remake" class="query-form-item">
               <el-input
-                v-model="formData.remake" style="width: 100%"
+                v-model="formData.remake" style="width: 80%"
                 auto-complete="off"
               ></el-input>
             </el-form-item>
@@ -743,6 +751,10 @@ export default {
         2: '按单校验三期',
         3: '按单不校验三期'
       },
+      inoutTypes: {
+        1: '入库',
+        2: '出库',
+      },
       corpTypeMap: {
         1: '客户',
         2: '供应商',
@@ -851,7 +863,7 @@ export default {
         workplaceType: 3,
         deptCode: null,
         chargeUser: null,
-        constituencies: null,
+        constituencies: "1001",
         invRemindNumber: 0,
         remake: null,
       };
@@ -1041,7 +1053,7 @@ export default {
         .then((response) => {
           var treeList = response.data || []
           const filteredList = treeList.filter(item => item.parentCode != null)
-          this.fromDeptOptions = filteredList
+          this.fromDeptOptions = treeList
         })
         .catch(() => {
         })
@@ -1216,7 +1228,7 @@ export default {
       })
     },
     removeBusType(row) {
-      this.$confirm('此操作将永久移除该单据类型, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该业务类型, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/collect/DealOrder.vue

@@ -9,28 +9,24 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
-              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
+              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{
                   this.userInfo.companyName
                 }}</span>
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >({{
+              >(用户&nbsp:&nbsp{{
                   this.userInfo.userName
                 }})</span>
             </div>
           </el-col>
         </el-row>
 
-
-      <!--  <el-alert-->
-      <!--  style="margin-top: 15px"-->
-      <!--  :title="msgTip"-->
-      <!--  :closable="false"-->
-      <!--  type="warning">-->
-      <!--</el-alert>-->
+        <!--  <el-alert-->
+        <!--  style="margin-top: 15px"-->
+        <!--  :title="msgTip"-->
+        <!--  :closable="false"-->
+        <!--  type="warning">-->
+        <!--</el-alert>-->
 
         <el-row :gutter="0" style="margin-top: 15px">
           <el-col :span="24" align="right">
@@ -209,14 +205,14 @@
             :prescribeData="curRow"
           ></prescribeOriginPanel>
         </el-tab-pane>
-<!--        <el-tab-pane label="扫码明细">-->
-<!--          <PanelOrderManuTagCode-->
-<!--            v-if="panelALive"-->
-<!--            :fifoSplit="3"-->
-<!--            :prescribeData="curRow"-->
-<!--            :refreshPanel="refreshCodesPanelP"-->
-<!--          ></PanelOrderManuTagCode>-->
-<!--        </el-tab-pane>-->
+        <!--        <el-tab-pane label="扫码明细">-->
+        <!--          <PanelOrderManuTagCode-->
+        <!--            v-if="panelALive"-->
+        <!--            :fifoSplit="3"-->
+        <!--            :prescribeData="curRow"-->
+        <!--            :refreshPanel="refreshCodesPanelP"-->
+        <!--          ></PanelOrderManuTagCode>-->
+        <!--        </el-tab-pane>-->
         <el-tab-pane label="拆零详情">
           <prescribeCodePanel
             v-if="panelALive"
@@ -326,7 +322,7 @@ import {enterCodeWeb} from "@/api/inout/order";
 import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
-import {getCurOrder, getNextOrder,findByBill} from "@/api/collect/collectOrder";
+import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
@@ -365,7 +361,7 @@ export default {
       curWorkPlaces: [],
       erpList: [],
       formData: {
-        billNo:null,
+        billNo: null,
         tagStatus: -1,
         invCode: null,
         busType: null,
@@ -419,16 +415,16 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo,workPlaceCode){
-      let post =  {
-          billNo: billNo,
-          workPlaceCode: workPlaceCode,
-          page: 1,
-          limit: 10,
-        }
+    getBillNo(billNo, workPlaceCode) {
+      let post = {
+        billNo: billNo,
+        workPlaceCode: workPlaceCode,
+        page: 1,
+        limit: 10,
+      }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0){
+          if (res.data.list.length > 0) {
             this.formData = res.data.list[0]
           }
         }
@@ -456,10 +452,10 @@ export default {
             if (this.formDataVisible.scanType == 1) {
               this.findFromInvList("");
             }
-            if (this.formData.billNo != null){
-              this.getBillNo(this.formData.billNo,this.formData.workplaceCode)
+            if (this.formData.billNo != null) {
+              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
               this.startDeal();
-            }else {
+            } else {
               this.findCurOrder();
             }
 
@@ -881,8 +877,6 @@ export default {
     }
 
 
-
-
   }
 
 }

src/views/collect/DealOrderBlank.vue

@@ -9,22 +9,18 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
-              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
-                  this.userInfo.companyName
-                }}</span>
+<!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
+<!--                  this.userInfo.companyName-->
+<!--                }}</span>-->
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >({{
+              >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
                   this.userInfo.userName
                 }})</span>
             </div>
           </el-col>
         </el-row>
 
-
         <!--  <el-alert-->
         <!--  style="margin-top: 15px"-->
         <!--  :title="msgTip"-->
@@ -56,7 +52,7 @@
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
-                @click.native="finishOrder()"
+                @click.native="confirmFinishOrder()"
               >处理完成
               </el-button>
 
@@ -326,7 +322,7 @@ import {enterCodeWeb} from "@/api/inout/order";
 import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
-import {getCurOrder, getNextOrder,findByBill} from "@/api/collect/collectOrder";
+import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
@@ -365,12 +361,13 @@ export default {
       curWorkPlaces: [],
       erpList: [],
       formData: {
-        billNo:null,
+        billNo: null,
         tagStatus: -1,
         invCode: null,
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
+        confirmFinish: false,
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -418,8 +415,8 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo,workPlaceCode){
-      let post =  {
+    getBillNo(billNo, workPlaceCode) {
+      let post = {
         billNo: billNo,
         workPlaceCode: workPlaceCode,
         page: 1,
@@ -427,7 +424,7 @@ export default {
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0){
+          if (res.data.list.length > 0) {
             this.formData = res.data.list[0]
           }
         }
@@ -455,10 +452,10 @@ export default {
             if (this.formDataVisible.scanType == 1) {
               this.findFromInvList("");
             }
-            if (this.formData.billNo != null){
-              this.getBillNo(this.formData.billNo,this.formData.workplaceCode)
+            if (this.formData.billNo != null) {
+              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
               this.startDeal();
-            }else {
+            } else {
               this.findCurOrder();
             }
 
@@ -880,8 +877,6 @@ export default {
     }
 
 
-
-
   }
 
 }

src/views/collect/IoCreateOrder.vue

@@ -570,6 +570,16 @@ export default {
       this.orderFormData.workPlaceCode = workPlaceCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
+
+
+      this.splitType = this.$route.query.splitType;
+      if (this.splitType == "search") {
+      } else if (this.splitType == "out") {
+        this.orderFormData.action = 'SC72197936495755';
+      } else if (this.splitType == "return") {
+        this.orderFormData.action = 'SC72249388338364';
+      }
+      this.orderFormData.fromCorp = "72198012799726";
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -1467,8 +1477,8 @@ export default {
     closeChooseDialog() {
       this.chooseDraftOrderVisible = false
     },
-    handleChoose(billNo) {
-      this.orderFormData.billNo = billNo
+    handleChoose(currentRow) {
+      this.orderQuery = currentRow
       this.refreshCodesPanel();
     },
     draftOrder() {

src/views/collect/chooseDraftOrderDialog.vue

@@ -1188,7 +1188,7 @@ export default {
     //选入
     choose(){
       this.closeChooseDialog()
-      this.handleChoose(this.radioCh)
+      this.handleChoose(this.currentRow)
     },
     //获取当前货位
     findCurWorkPlaces(val) {