111

src/components/Materialman/rukudan.vue

@@ -187,7 +187,7 @@
                                 <th>物料名称</th>
                                 <th>分类名称</th>
                                 <th>品牌</th>
-                                <th>单价</th>
+                                <th width="100px"><span class="cred">*单价</span></th>
                                 <th width="100px"><span class="cred">*入库数量</span></th>
                                 <th width="100px"><span class="cred">*入库金额</span></th>
                                 <th width="200px">备注</th>
@@ -201,7 +201,7 @@
                                 <td>{{item.SuppliesName}}</td>
                                 <td>{{item.CategoryName}}</td>
                                 <td>{{item.BrandName}}</td>
-                                <td>{{item.UnitPrice}}</td>
+                                <td><el-input @input="UnitPriceChange(item,index)" v-model="item.UnitPrice"></el-input></td>
                                 <td><el-input @input="NumberChange(item,index)" v-model="item.Number"></el-input></td>
                                 <td><el-input @input="MoneyChange(item,index)" v-model="item.Money"></el-input></td>
                                 <td><el-input v-model="item.Remark"></el-input></td>
@@ -405,10 +405,21 @@ export default {
             null
         );
     },
+    UnitPriceChange(item,index){
+        if(item.Number!='0' && item.Number!='' && item.UnitPrice!='0' && item.UnitPrice!=''){
+            this.wlItemList[index].Money=(Number(item.Number) * Number(item.UnitPrice)).toFixed(2);
+        }
+
+        this.addMsg.Money=0;
+        this.wlItemList.forEach(x=>{
+            this.addMsg.Money+=Number(x.Money)
+        })
+        this.$forceUpdate()
+    },
     NumberChange(item,index){
         item.Number = item.Number.replace(this.$commonUtils.Regex.isInteger, "");
-        if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){
-            this.wlItemList[index].UnitPrice=(Number(item.Money) / Number(item.Number)).toFixed(2);
+        if(item.Number!='0' && item.Number!='' && item.UnitPrice!='0' && item.UnitPrice!=''){
+            this.wlItemList[index].Money=(Number(item.Number) * Number(item.UnitPrice)).toFixed(2);
         }
 
         this.addMsg.Money=0;

src/components/approval/ListAssets.vue

@@ -256,6 +256,13 @@ export default {
   },
   methods: {
     goCode(){
+      if (this.dateList && this.dateList.length > 0) {
+        this.msg.StartTime = this.dateList[0];
+        this.msg.EndTime = this.dateList[1];
+      } else {
+        this.msg.StartTime = "";
+        this.msg.EndTime = "";
+      }
       let msg=JSON.stringify(this.msg)
       this.$router.push({
             path: "/codePrint",

src/components/assetsman/assetsList.vue

@@ -171,6 +171,9 @@
                   <el-tooltip class="item" effect="dark" content="变更领用人" placement="top" >
                     <img v-if="row.PropertyStatus == 2" @click="ChnagePeople(row)" style="width:24px;height:24px" src="../../assets/img/shbh.png" alt=""/>
                   </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="查看二维码" placement="top" >
+                    <img v-if="row.QRCode && row.QRCode!=''" @click="seeCode(row)" style="width:24px;height:24px" src="../../assets/img/pdsh.png" alt=""/>
+                  </el-tooltip>
               </template>
             </vxe-table-column>
         </vxe-table>
@@ -551,6 +554,14 @@
         </div>
       </el-form>
     </el-dialog>
+    <!-- 查看二维码 -->
+    <el-dialog top="0" title="资产二维码" :visible.sync="codeState" width="300px">
+      <div style="text-align:center;padding:30px 0 40px 0">
+        <img :src="imgUrl" alt="">
+        <p class="f14">{{codeNum}}</p>
+        <p class="f12" style="color:#FF7874;margin-top:10px">使用麦子助手扫一扫可快速盘点</p>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -566,6 +577,9 @@ export default {
   },
   data() {
     return {
+      codeNum:'',
+      imgUrl:'',
+      codeState:false,
       changeState:false,
       changeMsg:{
         EmployeeId:'',
@@ -714,6 +728,11 @@ export default {
     this.getPropertyStatus();
   },
   methods: {
+    seeCode(row){
+      this.codeState=true;
+      this.codeNum=row.PropertyNum;
+      this.imgUrl='http://property.oytour.com'+row.QRCode;
+    },
     ImportSee(path){
         this.$router.push({
             path: "/" + path,

src/components/global/CheckDetails.vue

@@ -24,7 +24,10 @@
               <span v-else>无</span>
             </p>
         </div>
-        <div class="baseTitle">基本信息</div>
+        <div class="CodeDiv">
+          <img :src="'http://property.oytour.com'+datainfo.QRCode" alt="">
+        </div>
+        <div class="baseTitle" style="margin-top:20px;">基本信息</div>
         <div class="baseDiv">
             <div class="desItem">
                 <p>资产名称</p>
@@ -236,6 +239,9 @@ export default {
 </script>
 
 <style>
+.CheckDetails .CodeDiv{
+  float: right;
+}
 .CheckDetails .baseDiv .desItem:nth-child(3n){
     margin-right:0;
 }

src/components/global/Login.vue

@@ -74,6 +74,7 @@ export default {
           this.userInfo.EmPassword = "123456";
         }
         this.userInfo.Domain = window.location.hostname
+        // this.userInfo.Domain = "zcyx.oytour.com";
       },
       Login(){
         if (this.userInfo.EmAccount == "") {

src/components/report/codePrint.vue

@@ -11,6 +11,9 @@
                
             </li>
         </ul>
+        <div v-show="tableData.length==0" style="text-align:center;padding:100px 0" class="f18">
+          暂无数据
+        </div>
     </div>
     <el-dialog top="0" title="资产详情" :visible.sync="CheckDetailState" width="1150px">
       <CheckDetails ref="mychild"></CheckDetails>