新增价格先进先出

.env.production

@@ -27,7 +27,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 
 刘恩典
-#  VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
 
 # 平潭正式
 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
@@ -37,7 +37,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
 # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'

src/api/inout/orderDetailCode.js

@@ -61,4 +61,19 @@ export function getCodeDetailList(params) {
   });
 }
 
+/**
+ * 扫码项情形修改
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function updateCodeProduct(query) {
+  return axios({
+    url: "/udiwms/inout/order/updateCodeProduct",
+    method: "post",
+    data: query
+  });
+}
+
+
+
 

src/views/basic/busType/bussinessType.vue

@@ -263,7 +263,7 @@ export default {
         checkVailDate: 0, //校验近效期
         checkExpire: true,   //校验过期
         checkCertExpire: false,//校验证书过期
-
+        editType:2,
         checkReview: null,
         secCheckReview: null,
         thrCheckReview: null,
@@ -551,6 +551,7 @@ export default {
         checkVailDate: 0, //校验近效期
         checkExpire: 2,   //校验过期
         checkCertExpire: 0, //校验证书过期
+        editType:2,
         backPreinType: 1,
         sortNum: 999
       }

src/views/inout/DialogCreateOrder.vue

@@ -55,8 +55,6 @@
 
           </el-button-group>
         </el-row>
-
-
         <el-row>
           <el-col :span="11">
             <el-form-item prop="corpOrderId" label="单据号:">
@@ -439,6 +437,7 @@
       <el-tab-pane label="扫码详情" v-if="viewCodeVisible">
         <codeDetailPanel
           :idQuery="orderFormData"
+          :curAction="curAction"
           :refreshPanel="refreshCodesPanel"
           :viewType="viewType"
           v-if="isCodeDetailAlive"
@@ -665,7 +664,8 @@ export default {
       curAction: {
         corpType: 0,
         genUnit: false,
-        checkWebNew: null
+        checkWebNew: null,
+        mainAction:null,
       },
       fromOptions: [],
       isCodeAlive: true,

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -329,7 +329,6 @@ export default {
     },
 
     saveChange(row) {
-
       if (row.batchNo == '') {
         row.batchNo = null;
       }

src/views/inout/PanelCreateOrderCodeDetail.vue

@@ -19,24 +19,50 @@
         </template>
       </el-table-column>
       <el-table-column label="失效日期" width="120" prop="expireDate" show-overflow-tooltip>
-        <template slot-scope="scope">
+        <template slot-scope="scope"12
+        、>
           <span>{{ convertDateFun(scope.row.expireDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
       <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
+      <!--      <el-table-column width="120" label="价格"-->
+      <!--                       v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-input v-model="scope.row.price"-->
+      <!--                    type='number'-->
+      <!--                    :disabled="scope.row.index !== selectedIndex"-->
+      <!--                    placeholder="请输入价格"-->
+      <!--          ></el-input>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="价格" width="120" prop="price" show-overflow-tooltip-->
+      <!--                       v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType==2)"></el-table-column>-->
       <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
       <el-table-column width="100" label="计量单位" prop="measname">
       </el-table-column>
       <el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
+
+      <el-table-column label="操作" width="160" fixed="right"
+                       v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" v-if="scope.row.index == selectedIndex" @click.stop="true"
+                     @click.native="saveChange(scope.row)">保存
+          </el-button>
+          <el-button type="text" size="small" v-if="scope.row.index != selectedIndex" @click.stop="true"
+                     @click.native="rowChange(scope.row)">编辑
+          </el-button>
+        </template>
+      </el-table-column>
+
     </el-table>
   </div>
 </template>
 
 <script>
 import {convertDate} from "@/utils/date";
-import {getDetailCodes} from "@/api/inout/orderDetailCode";
+import {getDetailCodes, updateBizProduct, updateCodeProduct} from "@/api/inout/orderDetailCode";
 
 export default {
   name: "IoCreateOrderCodeDetail",
@@ -49,6 +75,10 @@ export default {
       type: Object,
       required: true,
     },
+    curAction: {
+      type: Object,
+      required: true,
+    },
   },
   data() {
     return {
@@ -66,6 +96,15 @@ export default {
       editCodeVisible: false,
     }
   },
+
+  watch: {
+    "curAction": {
+      handler(newVal, oldVal) {
+
+      },
+      immediate: true
+    }
+  },
   methods: {
     getOrderDetails() {
       this.loading = true;
@@ -91,6 +130,36 @@ export default {
       return rowBackground;
     },
 
+
+    saveChange(row) {
+      if (row.batchNo == '') {
+        row.batchNo = null;
+      }
+      updateCodeProduct(row)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.selectedIndex = null;
+            this.refreshPanel();
+
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      if (this.currentRow.batchNo == '')
+        this.currentRow.batchNo = null;
+      this.selectedIndex = val.index;
+    },
+
   },
   created() {
     if (this.idQuery.billNo != null)

src/views/inventory/InvPreInProductsDetail.vue

@@ -59,7 +59,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="list" style="width: 100%"
-              :default-sort="defaultSort"     @sort-change="handleSortChange"
+              :default-sort="defaultSort" @sort-change="handleSortChange"
               border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
@@ -91,6 +91,12 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="入库数量"
         prop="inCount"
@@ -200,6 +206,8 @@ export default {
       this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
+      this.invProductDetailQuery.price = this.inputQuery.price;
+
       // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
       getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {
         this.loading = false;

src/views/inventory/InvPreProducts.vue

@@ -154,11 +154,14 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="货架" prop="spaceName"  v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="货架" prop="spaceName"
+                         v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip
+                         width="120"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="价格" prop="price" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120">
@@ -272,7 +275,9 @@ export default {
         expireDate: null,
         supId: null,
         deptCode: null,
-        invCode: null
+        invCode: null,
+        price: null,
+
       }
     };
   },
@@ -344,9 +349,9 @@ export default {
       findAllInvByUser(query)
         .then((response) => {
           this.invList = response.data || [];
-          for(var i=0;i< this.invList.length;i++){
+          for (var i = 0; i < this.invList.length; i++) {
-            if(this.invList[i].advanceType == 3){
+            if (this.invList[i].advanceType == 3) {
-              this.filterQuery.invCode=this.invList[i].code;
+              this.filterQuery.invCode = this.invList[i].code;
             }
           }
           this.getList();
@@ -376,7 +381,7 @@ export default {
         this.findMethod(value);
       }
     },
-    getcorp(){
+    getcorp() {
       this.findMethod();
     },
     detailDialog(row) {
@@ -391,7 +396,8 @@ export default {
         expireDate: row.expireDate,
         supId: row.supId,
         deptCode: row.deptCode,
-        invCode: row.invCode
+        invCode: row.invCode, price: row.price
+
       }
     },
     closeDetailDialog() {

src/views/inventory/InvPreProductsDetail.vue

@@ -59,7 +59,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="list" style="width: 100%"
-              :default-sort="defaultSort"  @sort-change="handleSortChange"
+              :default-sort="defaultSort" @sort-change="handleSortChange"
               border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
@@ -91,6 +91,12 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="入库数量"
         prop="inCount"
@@ -199,6 +205,7 @@ export default {
       this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
+      this.invProductDetailQuery.price = this.inputQuery.price;
       // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
       getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
         this.loading = false;

src/views/inventory/InvProducts.vue

@@ -161,6 +161,7 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="价格" prop="price" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120">
         </el-table-column>
@@ -290,7 +291,8 @@ export default {
         expireDate: null,
         supId: null,
         deptCode: null,
-        invCode: null
+        invCode: null,
+        price: null,
       },
       addInvRemindSetDialogVisible: false,
       invId: null,
@@ -393,7 +395,7 @@ export default {
         this.findMethod(value);
       }
     },
-    getcorp(){
+    getcorp() {
       this.findMethod();
     },
     detailDialog(row) {
@@ -409,9 +411,10 @@ export default {
         supId: row.supId,
         deptCode: row.deptCode,
         invCode: row.invCode,
-        invSpaceCode: row.invSpaceCode
+        invSpaceCode: row.invSpaceCode,
+        price: row.price
       }
-      if(this.$isBlank(this.filterQuery.invCode)){
+      if (this.$isBlank(this.filterQuery.invCode)) {
         this.inputQuery.deptCode = '';
         this.inputQuery.invCode = '';
       }

src/views/inventory/InvProductsDetail.vue

@@ -90,6 +90,12 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="入库数量"
         prop="inCount"
@@ -198,6 +204,7 @@ export default {
       this.invProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invProductDetailQuery.invCode = this.inputQuery.invCode;
+      this.invProductDetailQuery.price = this.inputQuery.price;
       /*if(!isBlank(this.invProductDetailQuery.invSpaceCode)){
         this.invProductDetailQuery.code=this.inputQuery.code
       }*/

src/views/inventory/InvSupPreInProducts.vue

@@ -160,6 +160,7 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="价格" prop="price" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120">
@@ -241,7 +242,7 @@ export default {
         page: 1,
         limit: 10,
       },
-      invSpaceCode:null,
+      invSpaceCode: null,
       list: [],
       total: 0,
       invList: [],
@@ -266,7 +267,9 @@ export default {
         expireDate: null,
         supId: null,
         deptCode: null,
-        invCode: null
+        invCode: null,
+        price: null,
+
       }
     };
   },
@@ -275,7 +278,7 @@ export default {
       this.$router.push({
         path: "",
       });
-      this.invSpaceCode=null
+      this.invSpaceCode = null
       this.filterQuery = {
         nameCode: null,
         cpmctymc: null,
@@ -293,8 +296,8 @@ export default {
     },
     onSubmit() {
       this.filterQuery.page = 1;
-      this.invSpaceCode=this.filterQuery.invSpaceCode,
+      this.invSpaceCode = this.filterQuery.invSpaceCode,
-      this.getList();
+        this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
@@ -372,7 +375,7 @@ export default {
         this.findMethod(value);
       }
     },
-    getcorp(){
+    getcorp() {
       this.findMethod();
     },
     detailDialog(row) {
@@ -388,7 +391,8 @@ export default {
         supId: row.supId,
         deptCode: row.deptCode,
         invCode: row.invCode,
-        invSpaceCode: this.invSpaceCode
+        invSpaceCode: this.invSpaceCode,
+        price: row.price
       }
     },
     closeDetailDialog() {

src/views/myLogin.vue

@@ -249,7 +249,6 @@ export default {
             this.$store
               .dispatch("Login", this.loginForm)
               .then((res) => {
-                debugger
                 if (res.data.needChangePwd == true) {
                   this.$confirm('系统检测到您的密码长时间未修改，为保证您的账号安全建议立即修改密码?', '提示', {
                     confirmButtonText: '立即修改',