Merge tag 'Hotfix-mo-28' into develop

Finish Hotfix-mo-28

src/views/supply/deliver/components/commerce_detail.vue

@@ -29,8 +29,8 @@
             <div class="value">{{detailData.orderType | orderTypeFilter}}</div>
           </el-col>
           <el-col :span="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
+            <div class="label">工程订单号</div>
+            <div class="value">{{detailData.enginOrderNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编码</div>
@@ -42,7 +42,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">工程编号</div>
-            <div class="value">{{detailData.projectNumber}}</div>
+            <div class="value">{{detailData.refEnginRecordNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">厂工程编码</div>

src/views/supply/deliver/components/home_detail.vue

@@ -29,8 +29,8 @@
             <div class="value">{{detailData.orderType | orderTypeFilter}}</div>
           </el-col>
           <el-col :span="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
+            <div class="label">工程订单号</div>
+            <div class="value">{{detailData.enginOrderNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编码</div>
@@ -42,7 +42,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">工程编号</div>
-            <div class="value">{{detailData.enginOrderNo}}</div>
+            <div class="value">{{detailData.refEnginRecordNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">厂工程编码</div>

src/views/supply/engin/components/commerce_form.vue

@@ -152,9 +152,19 @@
         <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.specification" size="small" v-if="listItem"></el-input>
+            <div v-else>{{scope.row.specification}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <div v-else>{{scope.row.price}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="工程信息数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -396,6 +406,12 @@ export default {
       warehouseValue: '',
     }
   },
+  
+  computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    }
+  },
 
   beforeCreate() {
     that = this;

src/views/supply/engin/components/home_form.vue

@@ -158,11 +158,17 @@
         <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.specification" size="small" v-if="listItem"></el-input>
+            <div v-else>{{scope.row.specification}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>
         <el-table-column align="center" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
@@ -511,6 +517,12 @@ export default {
     }
   },
 
+  computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    }
+  },
+
   beforeCreate() {
     that = this;
   },

src/views/supply/retail/components/retail_detail.vue

@@ -125,7 +125,7 @@
         </el-table>
       </div>
 
-      <div v-if="isExamine">
+      <div>
         <div class="main-title">
           <div class="title">审批记录</div>
         </div>

src/views/supply/retail/components/retail_form.vue

@@ -54,7 +54,7 @@
 
     <div class="main-title">
       <div class="title">货品信息</div>
-      <div v-if="!listItem">
+      <div>
         <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px">
           <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
         </el-select>
@@ -70,12 +70,22 @@
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialCode" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.specification" size="small" v-if="listItem"></el-input>
+            <div v-else>{{scope.row.specification}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <div v-else>{{scope.row.price}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
@@ -153,7 +163,7 @@
     </div>
 
     <div class="page-footer">
-      <div class="footer" :class="classObj">
+      <div class="footer">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>
@@ -261,7 +271,6 @@
 <script>
 import { getDetail, addData, editData, getSalesTypeList, getGoodsList, getWarehouseList, checkStock } from "@/api/supply/retail";
 import { getDictList } from '@/api/common'
-import { findElem } from '@/utils/util'
 
 let that
 export default {
@@ -330,15 +339,9 @@ export default {
   },
 
   computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    }
   },
 
   beforeCreate() {