Merge branch 'master' of http://172.16.100.139/new-business/drp-web

src/views/material/changeApply/add.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="apply_add">
+    <el-tabs type="border-card" v-model="tabValue" @tab-click="handleClick">
+      <el-tab-pane label="基本信息" name="first">
+        <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="160px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="单据编码" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申请组织" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="物料编码" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="物料名称" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="医药物料" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="一级分类" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="二级分类" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="三级分类" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="四级分类" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="规格" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="型号" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="生产厂家/代理人" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="注册人/上市许可持有人" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="存储条件" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="运输条件" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="交货周期" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="备注" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-tab-pane>
+
+      <el-tab-pane label="医药属性" name="second">
+        <el-form :model="basicForm2" :rules="basicRules2" ref="basic2" label-width="160px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="药品" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="注册证号/备案凭证编号" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="医疗器械" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="养护类型" prop="code">
+                <el-input v-model="basicForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span>物料类别</span>
+      </el-tab-pane>
+      <el-tab-pane label="修改记录" name="third">修改记录</el-tab-pane>
+      <el-tab-pane label="单据信息" name="fourth">单据信息</el-tab-pane>
+    </el-tabs>
+
+    <div class="btn_group">
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="save">保存</el-button>
+      </el-col>
+      <el-col :span="1.5" style="margin: 0 10px;">
+        <el-button type="primary" size="small" plain @click="submit">提交</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="back">返回</el-button>
+      </el-col>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'applyAdd',
+  model: {
+    prop: 'isList',
+    event: 'jugislist'
+  },
+  data() {
+    return{
+      tabValue: 'first',
+      basicForm: {
+        code: ''
+      },
+      basicRules: {}
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    save() {},
+    submit() {},
+    back() {
+      this.$emit('jugislist', true)
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .apply_add {
+  height: calc(100vh - 84px);
+  padding: 12px;
+  box-sizing: border-box;
+}
+.btn_group {
+  width: 100%;
+  margin: 20px 0;
+  display: flex;
+  justify-content: center;
+}
+</style>

src/views/material/changeApply/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="changeApply">
+    <div class="applyList" v-if="isList">
+    <el-row :gutter="10" class="mb10">
+      <el-col :span="1.5">
+
+        <el-select size="small" v-model="textValue" placeholder="请选择">
+        <el-option
+          v-for="item in text"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+
+      <el-select size="small" v-model="ruleValue" placeholder="请选择">
+        <el-option
+          v-for="item in rule"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+
+      <el-input
+        v-model="input"
+        size="small"
+        placeholder="请输入"
+        clearable
+        style="width: 240px"
+      />
+
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>高级查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>重置</el-button>
+      </el-col>
+
+    </el-row>
+
+    <el-row :gutter="10" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="addApply">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>批量提交</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>批量删除</el-button>
+      </el-col>
+    </el-row>
+
+    <el-card>
+      <el-table 
+        :data="tableList" 
+        class="request-table"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="序号" align="center" prop="sort" />
+        <el-table-column label="申请组织" align="center" prop="attributeName" />
+        <el-table-column label="单据编码" align="center" prop="classCode" />
+        <el-table-column label="申请人" align="center" prop="fieldType" />
+        <el-table-column label="申请时间" align="center" prop="dictId" />
+        <el-table-column label="单据状态" align="center" prop="fieldDesc" />
+        <el-table-column label="物料编码" align="center" prop="fieldDesc" />
+        <el-table-column label="物料名称" align="center" prop="fieldDesc" />
+        <el-table-column label="最后审批人" align="center" prop="fieldDesc" />
+        <el-table-column label="最后审核时间" align="center" prop="fieldDesc" />
+        <el-table-column label="创建人" align="center" prop="fieldDesc" />
+        <el-table-column label="创建时间" align="center" prop="fieldDesc" />
+        <el-table-column label="最后修改人" align="center" prop="fieldDesc" />
+        <el-table-column label="最后修改时间" align="center" prop="fieldDesc" />
+        <el-table-column
+          fixed="right"
+          label="操作"
+          align="center"
+          >
+          <template slot-scope="scope">
+            <el-button type="text" size="small">查看</el-button>
+            <el-button @click="edit(scope.row)" type="text" size="small">修改</el-button>
+            <el-button type="text" size="small">更多</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="100"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="100"
+        style="text-align: center;">
+      </el-pagination>
+    </el-card>
+    </div>
+
+    <component :is="isComponent" v-model="isList" v-if="!isList"/>
+  </div>
+</template>
+
+<script>
+import addApply from './add.vue';
+export default {
+  name: 'changeApply',
+  components: {
+    addApply
+  },
+  data() {
+    return{
+      textValue: 1,
+      text: [{label: '文本字段', value: 1}, {label: '字典字段', value: 2}],
+      ruleValue: 1,
+      rule:[{label: '包含', value: 1}, {label: '不包含', value: 2}, {label: '等于', value: 3}, {label: '不等于', value: 4}],
+      input: '',
+      // 
+      tableList: [],
+      currentPage: 2,
+      // isComponent
+      isComponent:'addApply',
+      isList: true
+    }
+  },
+  methods: {
+    addApply() {
+      this.isList = false
+      this.isComponent = 'addApply'
+    },
+    // 
+    handleSelectionChange () {
+
+    },
+    edit() {
+
+    },
+    handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.changeApply {
+  height: calc(100vh - 84px);
+  padding: 12px;
+  box-sizing: border-box;
+}
+</style>

src/views/material/specialAttr/index.vue

@@ -324,7 +324,15 @@ export default {
     // 点击取消
     cancel() {
       this.dialogFormVisible = false
-      this.$refs['bindForm'].resetFields();
+      // this.$refs['bindForm'].resetFields();
+      this.form = {
+        attributeName: '',
+        attributeCode: '',
+        fieldType: '',
+        dictId: '',
+        sort: '',
+        fieldDesc: ''
+      }
     },
     // 搜索框
     querySearch(queryString, cb) {