Преглед изворни кода

解决启用、停用判断

002390 пре 2 година
родитељ
комит
e63865d4b8
2 измењених фајлова са 23 додато и 21 уклоњено
  1. 21 19
      src/views/material/basicFile/details.vue
  2. 2 2
      vue.config.js

+ 21 - 19
src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                                                                                                                                                                                                                                                                                                                  <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                                                                                                                                                                                                                                              <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -41,7 +41,7 @@
             <el-button size="small" @click="handleMaterialType">维护物料类别</el-button>
             <el-button size="small" @click="handleIsInvoke" :key="count">
               <!-- 0:启用  2:停用 -->
-              {{ basicData.value.isEnable == '0' ? '停用' : '启用' }}
+              {{ basicData.value.isEnable == '已启用' ? '停用' : '启用' }}
             </el-button>
           <!-- <el-dropdown split-button size="small" @click="handleIsInvoke(true)" @command="handleIsInvoke">
               启用
@@ -49,7 +49,7 @@
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
               </el-dropdown-menu>
-                                                                                                                                                                                                                                                                                                                                                                 </el-dropdown> -->
+                                                                                                                                                                                                                                                                                                                                                                             </el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -58,7 +58,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                          </el-col> -->
+                                                                                                                                                                                                                                                                                                                      </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -66,7 +66,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                            </el-col> -->
+                                                                                                                                                                                                                                                                                                                        </el-col> -->
 
       </el-row>
 
@@ -112,7 +112,7 @@
           <!-- 附件管理 -->
         <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-                                                                                                                                                                                                                                                                                                          </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                      </el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -124,7 +124,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-                                                                                                                                                                                                                                                                                                          </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                      </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -177,14 +177,16 @@
                           <el-select v-if="f.apiUrl" v-model="basicData.value[`${f.prop}Name`]" :placeholder="f.name"
                             :key="basicData.value[f.prop]" :disabled="handleJudge(f)"
                             @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
+
                             <!-- <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel":value="d.dictCode"></el-option> -->
 
                             <div slot="empty"></div>
                           </el-select>
 
-                          <el-select v-else v-model="basicData.value[f.prop]" :placeholder="f.name"
-                            :key="basicData.value[f.prop]" :disabled="handleJudge(f)"
-                            @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
+                          <!--  @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })" -->
+
+                          <el-select v-if="f.dictId" v-model="basicData.value[f.prop]" :placeholder="f.name"
+                            :key="basicData.value[f.prop]" :disabled="handleJudge(f)">
                             <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
                               :value="d.dictCode">
                             </el-option>
@@ -221,10 +223,10 @@
                   <el-table-column v-for="m in  mainMsg.form" v-if="m.show" :label="m.name" align="center"
                     :prop="m.attribute == 'select' ? `${m.prop}Name` : m.prop" show-overflow-tooltip>
                     {{ m.attribute == 'select' ? scope.row[`${m.prop}Name`] :
-                          (m.attribute == 'checkbox' ?
-                            (scope.row[m.prop] == '0' ? '是' : '否')
-                            : scope.row[m.prop])
-                        }} 
+                      (m.attribute == 'checkbox' ?
+                        (scope.row[m.prop] == '0' ? '是' : '否')
+                        : scope.row[m.prop])
+                    }}
                   </el-table-column>
                 </el-table>
 
@@ -264,7 +266,7 @@
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
 
                               <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
-                                                                                                                        :label="d.dictLabel" :value="d.dictValue"></el-option> -->
+                                                                                                                                    :label="d.dictLabel" :value="d.dictValue"></el-option> -->
 
                                 <div slot="empty"></div>
                               </el-select>
@@ -406,7 +408,7 @@
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
               </el-option>
-                                                                                                                                          </el-select> -->
+                                                                                                                                                      </el-select> -->
 
             <!-- 其他类型 -->
 
@@ -458,7 +460,7 @@
           <el-collapse-item title="物料基本信息" name="basic">
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
-                                                                                                                                                                                                  <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
+                                                                                                                                                                                                              <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -469,7 +471,7 @@
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
               </el-form-item>
             <!-- <el-form-item label="版本号">
-                                                                                                                                                                                                <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
+                                                                                                                                                                                                            <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
 
             </el-form>
           </el-collapse-item>
@@ -1425,7 +1427,7 @@ export default {
     // 启用
     handleIsInvoke(e) {
       console.log('启用', this.basicData.value.isEnable);
-      if (this.basicData.value.isEnable == '0') {
+      if (this.basicData.value.isEnable == '已启用') {
         this.basicData.value.isEnable = '2';
       } else {
         // this.basicData.isEnable 为空或者为2

+ 2 - 2
vue.config.js

@@ -37,11 +37,11 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        target: `http://test-sy.derom.com/drp-admin`, //测试1
+        // target: `http://test-sy.derom.com/drp-admin`, //测试1
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
-        // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
+        target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         changeOrigin: true,
         pathRewrite: {