Ver Fonte

no message

linwenxin há 5 meses atrás
pai
commit
31a6b75fdb

+ 0 - 1
src/views/setting/role.vue

@@ -296,7 +296,6 @@ export default {
       this.editId = id
       getMenuList({ adminUserId: this.userid }).then(res => {
         this.menuRoleList = res.data
-
         console.log(this.menuRoleList)
       })
       getMenuRoleIds({ adminRoleId: id }).then(res => {

+ 13 - 32
src/views/supply/engin/components/engin_examine.vue

@@ -140,7 +140,10 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">文件编号</div>
-          <div class="value">{{ detailData.fileNo }}</div>
+          <div class="value">
+            <!-- {{ detailData.fileNo }} -->
+            <el-input v-model="detailData.fileNo" placeholder="请输入" />
+          </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
@@ -177,10 +180,10 @@
         <el-col :span="8" class="item">
           <div class="label">合同有效期</div>
           <div class="value">
+            <!-- :disabled="isCustomer" -->
             <el-date-picker
               v-model="detailData.contractExpireDate"
               type="date"
-              :disabled="isCustomer"
               prefix-icon="none"
               value-format="yyyy-MM-dd"
               style="width: 100%"
@@ -211,34 +214,10 @@
         :summary-method="$getSummaries"
       >
         <el-table-column align="center" label="序号" type="index" width="50" />
-        <el-table-column
-          align="left"
-          label="销售类型"
-          prop="saleTypeName"
-          min-width="120"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="left"
-          label="物料编码"
-          prop="materialNumber"
-          min-width="120"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="left"
-          label="产品编码"
-          prop="materialOldNumber"
-          min-width="120"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="left"
-          label="产品名称"
-          prop="materialName"
-          min-width="160"
-          show-overflow-tooltip
-        />
+        <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip />
+        <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip />
+        <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip />
+        <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
         <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.specification" size="small" />
@@ -625,7 +604,7 @@ export default {
 
     // 获取商品列表
     getGoodsList() {
-      console.log(this.goodsList,"000")
+      console.log(this.goodsList, '000')
       getRetailProductList({
         pageNum: this.currentPage,
         pageSize: 10,
@@ -643,7 +622,9 @@ export default {
           const oldItem = oldGoodsList[i]
           for (let j = 0; j < newGoodsList.length; j++) {
             const newItem = newGoodsList[j]
-            if (`${newItem.materialNumber}_${newItem.saleTypeId}` === `${oldItem.materialNumber}_${oldItem.saleTypeId}`) {
+            if (
+              `${newItem.materialNumber}_${newItem.saleTypeId}` === `${oldItem.materialNumber}_${oldItem.saleTypeId}`
+            ) {
               newGoodsList[j].selected = true
               break
             }