apply-clients 5.0.35-ezhou-25-16 → 5.0.35-ezhou-25-17

package/src/components/product/Function/functions/InstallFee.vue

@@ -171,6 +171,8 @@
                               :options='printstyle'
                               close-on-select clear-button>
                     </v-select>
+                    <br>
+                    <span v-if="model.f_print[0] === '数电专票'" style="color: red; font-size: 12px">您当前选择的票据格式是数电专票，请确认</span>
                   </div>
                 </div>
                 <div class="form-input-group col-sm-3">

package/src/components/product/Overview/addMaterialScience.vue

@@ -1,217 +1,217 @@
-<template>
-  <div class="flex" style="height: auto">
-    <div style="height: auto" class="flex">
-      <div class="bg-info text-center" style="padding: 8px;font-size: 20px">材料信息
-      </div>
-      <div class="form-inline auto"  style="margin-bottom: 5px;">
-        <criteria-paged :model="model" :pager="true" v-ref:paged1 >
-          <data-grid :model="$parent.model" v-ref:grid1  partial='list'>
-            <template partial='head'>
-              <tr>
-                <th><nobr>序号</nobr></th>
-                <th><nobr>分项内容</nobr></th>
-                <th><nobr>规格型号</nobr></th>
-                <th><nobr>单位</nobr></th>
-                <th><nobr>数量</nobr></th>
-                <th><nobr>生产厂家</nobr></th>
-                <th style="padding: 0px">
-                  <button class="btn btn-success" @click="$parent.$parent.$parent.modify()">+</button>
-                  <button class="btn btn-success" @click="$parent.$parent.$parent.search()">查询</button>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center;">{{ $index + 1 }}</td>
-              <td style="text-align: center;">{{ row.f_material_name }}</td>
-              <td style="text-align: center;">{{ row.f_material_style }}</td>
-              <td style="text-align: center;">{{ row.f_material_unit }}</td>
-              <td style="text-align: center;">{{ row.f_material_number }}</td>
-              <td style="text-align: center;">{{ row.f_material_manufacturer }}</td>
-              <td style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link"
-                        @click="$parent.$parent.$parent.update(row)">修正
-                </button>
-                <button type="button" name="button" class="btn btn-link"
-                        @click="$parent.$parent.$parent.delete(row)">移除
-                </button>
-              </td>
-            </template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-    <modal :show.sync="modifyshow" backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">材料信息</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="form-group">
-            <label for="f_material_name" class="control-label">分项内容</label>
-            <input-select
-              readonly="readonly" :value.sync="model.f_material_name"
-              v-model="model.f_material_name"
-              :options='material_names' :valueSingle="true"></input-select>
-          </div>
-          <div class="form-group">
-            <label for="f_material_style" class="control-label">规格型号</label>
-            <input type="string" class="form-control" v-model="model.f_material_style"
-                   placeholder='规格型号'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_unit" class="control-label">单位</label>
-            <input type="string" class="form-control" v-model="model.f_material_unit"
-                   placeholder='单位'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_number" class="control-label">数量</label>
-            <input type="number" class="form-control" v-model="model.f_material_number"
-                   placeholder='数量'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_manufacturer" class="control-label">生产厂家</label>
-            <input type="string" class="form-control" v-model="model.f_material_manufacturer"
-                   placeholder='生产厂家'>
-          </div>
-        </form>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-success" @click='modifyConfirm'>确认</button>
-        <button type="button" class="btn btn-default" @click='modifyclose'>取消</button>
-      </footer>
-    </modal>
-    <modal :show.sync="updateshow" backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">材料信息</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="form-group">
-            <label for="f_material_name" class="control-label">分项内容</label>
-            <input-select
-              readonly="readonly" :value.sync="updaterow.f_material_name"
-              v-model="updaterow.f_material_name"
-              :options='material_names' :valueSingle="true"></input-select>
-          </div>
-          <div class="form-group">
-            <label for="f_material_style" class="control-label">规格型号</label>
-            <input type="string" class="form-control" v-model="updaterow.f_material_style"
-                   placeholder='规格型号'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_unit" class="control-label">单位</label>
-            <input type="string" class="form-control" v-model="updaterow.f_material_unit"
-                   placeholder='单位'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_number" class="control-label">数量</label>
-            <input type="number" class="form-control" v-model="updaterow.f_material_number"
-                   placeholder='数量'>
-          </div>
-          <div class="form-group">
-            <label for="f_material_manufacturer" class="control-label">生产厂家</label>
-            <input type="string" class="form-control" v-model="updaterow.f_material_manufacturer"
-                   placeholder='生产厂家'>
-          </div>
-        </form>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-success" @click='updateConfirm'>确认</button>
-        <button type="button" class="btn btn-default" @click='updateyclose'>取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-import {PagedList, HttpResetClass} from 'vue-client'
-import {toStandardTimeString} from '../../Util'
-
-export default {
-  title: '添加材料',
-  props: ['selectdata'],
-  data() {
-    return {
-      model: new PagedList('rs/sql/getmaterialapply', 8, { orderitem: '`id`'}),
-      modifyshow: false,
-      updateshow: false,
-      updaterow: null,
-      material_names: this.$appdata.getParam('分项内容')
-    }
-  },
-  ready() {
-    this.search()
-    console.log('登录信息', this.$login.f)
-  },
-  methods: {
-    search () {
-      let condition = ` f_process_id  = '${this.selectdata.f_process_id}'`
-      this.model.search(condition)
-    },
-    modify () {
-      this.modifyshow = true
-    },
-    modifyclose () {
-      this.modifyshow = false
-      this.search()
-    },
-    modifyConfirm () {
-      let data = {
-        f_material_name: this.model.f_material_name,
-        f_material_style: this.model.f_material_style,
-        f_material_unit: this.model.f_material_unit,
-        f_material_number: this.model.f_material_number,
-        f_material_manufacturer: this.model.f_material_manufacturer,
-        f_process_id: this.selectdata.f_process_id,
-        f_operation_date: toStandardTimeString(),
-        f_operator: this.$login.f.name,
-        f_operator_id: this.$login.f.id,
-        f_orgid: this.$login.f.f_orgids,
-        f_orgname: this.$login.f.filialenames
-      }
-      this.$showMessage(`是否确认添加新的材料信息`, ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          let http = new HttpResetClass()
-          http.load('post', 'rs/logic/savematerialapply', {data: data}, {resolveMsg: '保存成功！', rejectMsg: '保存失败！'})
-        }
-      })
-    },
-    update (row) {
-      this.updaterow = row
-      this.updateshow = true
-    },
-    updateyclose () {
-      this.updaterow = {}
-      this.updateshow = false
-      this.search()
-    },
-    updateConfirm () {
-      this.$showMessage(`是否确认修改该材料信息`, ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          let http = new HttpResetClass()
-          http.load('post', 'rs/logic/savematerialapply', {data: this.updaterow}, {resolveMsg: '保存成功！', rejectMsg: '保存失败！'})
-        }
-      })
-    },
-    delete (row) {
-      this.$showMessage(`是否确认删除此材料信息`, ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          let data = {
-            tablename: 't_material_apply',
-            id: row.id
-          }
-          let http = new HttpResetClass()
-          http.load('post', 'rs/logic/applyDeleteValue', {data: data}, {resolveMsg: '删除成功！', rejectMsg: '删除失败！'})
-          this.search()
-        }
-      })
-    }
-  },
-  computed: {},
-  events: {},
-  watch: {
-    'selectdata.f_process_id'() {
-      this.search()
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex" style="height: auto">
+    <div style="height: auto" class="flex">
+      <div class="bg-info text-center" style="padding: 8px;font-size: 20px">材料信息
+      </div>
+      <div class="form-inline auto"  style="margin-bottom: 5px;">
+        <criteria-paged :model="model" :pager="true" v-ref:paged1 >
+          <data-grid :model="$parent.model" v-ref:grid1  partial='list'>
+            <template partial='head'>
+              <tr>
+                <th><nobr>序号</nobr></th>
+                <th><nobr>分项内容</nobr></th>
+                <th><nobr>规格型号</nobr></th>
+                <th><nobr>单位</nobr></th>
+                <th><nobr>数量</nobr></th>
+                <th><nobr>生产厂家</nobr></th>
+                <th style="padding: 0px">
+                  <button class="btn btn-success" @click="$parent.$parent.$parent.modify()">+</button>
+                  <button class="btn btn-success" @click="$parent.$parent.$parent.search()">查询</button>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{ $index + 1 }}</td>
+              <td style="text-align: center;">{{ row.f_material_name }}</td>
+              <td style="text-align: center;">{{ row.f_material_style }}</td>
+              <td style="text-align: center;">{{ row.f_material_unit }}</td>
+              <td style="text-align: center;">{{ row.f_material_number }}</td>
+              <td style="text-align: center;">{{ row.f_material_manufacturer }}</td>
+              <td style="text-align: center;">
+                <button type="button" name="button" class="btn btn-link"
+                        @click="$parent.$parent.$parent.update(row)">修正
+                </button>
+                <button type="button" name="button" class="btn btn-link"
+                        @click="$parent.$parent.$parent.delete(row)">移除
+                </button>
+              </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+    <modal :show.sync="modifyshow" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">材料信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label for="f_material_name" class="control-label">分项内容</label>
+            <input-select
+              readonly="readonly" :value.sync="model.f_material_name"
+              v-model="model.f_material_name"
+              :options='material_names' :valueSingle="true"></input-select>
+          </div>
+          <div class="form-group">
+            <label for="f_material_style" class="control-label">规格型号</label>
+            <input type="string" class="form-control" v-model="model.f_material_style"
+                   placeholder='规格型号'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_unit" class="control-label">单位</label>
+            <input type="string" class="form-control" v-model="model.f_material_unit"
+                   placeholder='单位'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_number" class="control-label">数量</label>
+            <input type="number" class="form-control" v-model="model.f_material_number"
+                   placeholder='数量'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_manufacturer" class="control-label">生产厂家</label>
+            <input type="string" class="form-control" v-model="model.f_material_manufacturer"
+                   placeholder='生产厂家'>
+          </div>
+        </form>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='modifyConfirm'>确认</button>
+        <button type="button" class="btn btn-default" @click='modifyclose'>取消</button>
+      </footer>
+    </modal>
+    <modal :show.sync="updateshow" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">材料信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label for="f_material_name" class="control-label">分项内容</label>
+            <input-select
+              readonly="readonly" :value.sync="updaterow.f_material_name"
+              v-model="updaterow.f_material_name"
+              :options='material_names' :valueSingle="true"></input-select>
+          </div>
+          <div class="form-group">
+            <label for="f_material_style" class="control-label">规格型号</label>
+            <input type="string" class="form-control" v-model="updaterow.f_material_style"
+                   placeholder='规格型号'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_unit" class="control-label">单位</label>
+            <input type="string" class="form-control" v-model="updaterow.f_material_unit"
+                   placeholder='单位'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_number" class="control-label">数量</label>
+            <input type="number" class="form-control" v-model="updaterow.f_material_number"
+                   placeholder='数量'>
+          </div>
+          <div class="form-group">
+            <label for="f_material_manufacturer" class="control-label">生产厂家</label>
+            <input type="string" class="form-control" v-model="updaterow.f_material_manufacturer"
+                   placeholder='生产厂家'>
+          </div>
+        </form>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='updateConfirm'>确认</button>
+        <button type="button" class="btn btn-default" @click='updateyclose'>取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import {toStandardTimeString} from '../../Util'
+
+export default {
+  title: '添加材料',
+  props: ['selectdata'],
+  data() {
+    return {
+      model: new PagedList('rs/sql/getmaterialapply', 8, { orderitem: '`id`'}),
+      modifyshow: false,
+      updateshow: false,
+      updaterow: null,
+      material_names: this.$appdata.getParam('分项内容')
+    }
+  },
+  ready() {
+    this.search()
+    console.log('登录信息', this.$login.f)
+  },
+  methods: {
+    search () {
+      let condition = ` f_process_id  = '${this.selectdata.f_process_id}'`
+      this.model.search(condition)
+    },
+    modify () {
+      this.modifyshow = true
+    },
+    modifyclose () {
+      this.modifyshow = false
+      this.search()
+    },
+    modifyConfirm () {
+      let data = {
+        f_material_name: this.model.f_material_name,
+        f_material_style: this.model.f_material_style,
+        f_material_unit: this.model.f_material_unit,
+        f_material_number: this.model.f_material_number,
+        f_material_manufacturer: this.model.f_material_manufacturer,
+        f_process_id: this.selectdata.f_process_id,
+        f_operation_date: toStandardTimeString(),
+        f_operator: this.$login.f.name,
+        f_operator_id: this.$login.f.id,
+        f_orgid: this.$login.f.f_orgids,
+        f_orgname: this.$login.f.filialenames
+      }
+      this.$showMessage(`是否确认添加新的材料信息`, ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let http = new HttpResetClass()
+          http.load('post', 'rs/logic/savematerialapply', {data: data}, {resolveMsg: '保存成功！', rejectMsg: '保存失败！'})
+        }
+      })
+    },
+    update (row) {
+      this.updaterow = row
+      this.updateshow = true
+    },
+    updateyclose () {
+      this.updaterow = {}
+      this.updateshow = false
+      this.search()
+    },
+    updateConfirm () {
+      this.$showMessage(`是否确认修改该材料信息`, ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let http = new HttpResetClass()
+          http.load('post', 'rs/logic/savematerialapply', {data: this.updaterow}, {resolveMsg: '保存成功！', rejectMsg: '保存失败！'})
+        }
+      })
+    },
+    delete (row) {
+      this.$showMessage(`是否确认删除此材料信息`, ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            tablename: 't_material_apply',
+            id: row.id
+          }
+          let http = new HttpResetClass()
+          http.load('post', 'rs/logic/applyDeleteValue', {data: data}, {resolveMsg: '删除成功！', rejectMsg: '删除失败！'})
+          this.search()
+        }
+      })
+    }
+  },
+  computed: {},
+  events: {},
+  watch: {
+    'selectdata.f_process_id'() {
+      this.search()
+    }
+  }
+}
+</script>