sale-client 3.7.75 → 3.7.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue +2 -2
  3. package/src/filiale/kelai/ChargeManage.vue +1 -1
  4. package/src/filiale/rongchuang/MeterinfoTest.vue +12 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.7.75",
3
+ "version": "3.7.77",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue CHANGED
@@ -154,11 +154,11 @@
154
154
  <button v-if="$login.r.includes('取消指令')" @click="$parent.$parent.$parent.backSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>取消指令</button>
155
155
  </nobr>
156
156
  </td>
157
- <td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送' && row.f_instruct_state !== '执行成功'">
157
+ <td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送'">
158
158
  <nobr>
159
159
  {{row.f_receive_state}}
160
160
 
161
- <button v-if="$login.r.includes('指令重发')" @click="$parent.$parent.$parent.reSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>指令重发</button>
161
+ <button v-if="$login.r.includes('指令重发') && row.f_instruct_state !== '执行成功'" @click="$parent.$parent.$parent.reSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>指令重发</button>
162
162
  </nobr>
163
163
  </td>
164
164
  <td style="text-align:center;" v-if="row.f_instruct_state === '取消发送'">
package/src/filiale/kelai/ChargeManage.vue CHANGED
@@ -234,7 +234,7 @@ export default {
234
234
  this.serRow(row)
235
235
  return
236
236
  }
237
- if (this.reSearchShowBusiness && this.$login.r.includes('服务评价') && name !== '评价') {
237
+ if (this.reSearchShowBusiness && this.$login.r.includes('评价') && name !== '评价') {
238
238
  console.log('row', row)
239
239
  this.$refs.oper.noButton = false
240
240
  this.$showMessage('要进行业务评价吗？', ['confirm', 'cancel']).then((res) => {
package/src/filiale/rongchuang/MeterinfoTest.vue CHANGED
@@ -201,6 +201,18 @@
201
201
  <input type="text" v-show="false"
202
202
  v-model="row.f_install_date" v-validate:f_install_date='{required: true }' >
203
203
  </div>
204
+ <div class="col-sm-4 form-group" v-show="true" :class="[$m.f_produce_date.required ? 'has-error' : '']">
205
+ <label for="f_produce_date" class="font_normal_body">&ensp;生产日期</label>
206
+ <datepicker style="width:60%" id="startDate1" placeholder="生产日期" width='100%'
207
+ v-model="row.f_produce_date"
208
+ :value.sync="row.f_produce_date"
209
+ class="datepicker"
210
+ :format="'yyyy-MM-dd HH:mm:ss'"
211
+ :show-reset-button="true">
212
+ </datepicker>
213
+ <input type="text" v-show="false"
214
+ v-model="row.f_produce_date" v-validate:f_produce_date='{required: true }' >
215
+ </div>
204
216
  <div class="col-sm-4 form-group">
205
217
  <label for="f_adjustable" class="font_normal_body">&ensp;调&ensp;压&ensp;箱</label>
206
218
  <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select