修改问题

src/api/modular/system/appManage.js

@@ -242,3 +242,27 @@ export function ServiceWorkFlowBaseGetPage (parameter) {
     data: parameter
   })
 }
+
+export function projectQueryList (parameter) {
+  return axios({
+    url: '/ServiceProject/QueryList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function QueryActivitiesList (parameter) {
+  return axios({
+    url: '/ServiceWorkFlowBase/QueryActivitiesList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function QueryListStatus (parameter) {
+  return axios({
+    url: '/StatusSkuBase/QueryList',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/detail/index.vue

@@ -1058,7 +1058,7 @@ export default {
       })
         .then(res => {
           this.$message.destroy()
-          this.setDeatilsFun(res)
+          this.setDeatilsFun(res, false)
         })
         .catch(err => {
           console.log(err)
@@ -1303,11 +1303,13 @@ export default {
         this.setSET_SAVEFLAG(true)
         _data.ctnInputs.map((item, index) => {
             if (!item.ctncode) {
-              this.ctnallList.forEach(ite => {
+              if (this.ctnallList) {
+                this.ctnallList.forEach(ite => {
                 if (item.ctnall === ite.name) {
                   item.ctncode = ite.code
                 }
               })
+              }
             }
         })
         BookingOrderSave(_data)

src/views/main/BookingLedger/detail/modules/cargoInfo.vue

@@ -53,10 +53,11 @@
                 </div>
                 <div class="left" v-else>
                   <div class="title" :class="{ 'required': rules['description'] && rules['description'][0].required }">
-                    Description of Goods (包装种类与货名)<span
+                    <span
                       @click="handleOpen(2)"
-                      style="cursor: pointer;color: black;"
-                      class="copy-btn iconfont icon-bianji"></span></div>
+                      style="cursor: pointer;color: black;margin: 0px;"
+                      class="copy-btn iconfont icon-bianji"></span>
+                    Description of Goods (包装种类与货名)</div>
                   <a-form-model-item
                     has-feedback
                     prop="goodsname"

src/views/main/BookingLedger/detail/modules/goodsTable.vue

@@ -309,11 +309,6 @@ export default {
                     const data = this.packageList[val]
                     this.tableData[rowIndex].kindpkgs = data.name
                     row['kindpkgs'] = data.name
-                    setTimeout(() => {
-                      this.tableData.map((item, index) => {
-                        item.kindpkgs = this.packageList[val].name || ''
-                      })
-                    }, 300)
                     this.$forceUpdate()
                   } else {
                     row['kindpkgs'] = ''
@@ -1183,9 +1178,9 @@ export default {
           this.id = this.$route.query.id
         }
 
-        // if (this.$route.name === 'BookingDetail') {
-        //   // this.init()
-        // }
+       if (this.$route.name === 'BookingDetail') {
+          this.init()
+       }
       }
     },
     totalKgs() {

src/views/main/BookingLedger/detail/modules/rightContent.vue

@@ -974,7 +974,6 @@ export default {
         bookingId: this.$route.query.id,
         item: []
       }
-      console.log(this.details.goodsStatus, 132213)
       this.details.goodsStatus.forEach(item => {
         if (item.finishTime || item.remark) {
           ApiData.item.push(item)
@@ -1000,6 +999,7 @@ export default {
             this.booGoodsStatusItem = res.data
             this.$emit('inGoodsSave', true)
             this.details.goodsStatus = res.data
+            this.$store.commit('SET_SAVENEEDNUMBER', this.details.id)
             setTimeout(() => {
               this.$emit('inGoodsSave', false)
             }, 400)

src/views/main/BookingLedger/list/index.vue

@@ -141,7 +141,7 @@
                 v-bind="gridOptions"
                 row-class-name="line-box"
                 :height="tableHeight"
-                :row-config="{ isHover: true }"
+                :row-config="{ isHover: true,isCurrent: true }"
                 :checkbox_config="{ checkField: 'checked' }"
                 :checkbox-config="{ highlight: true }"
                 :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
@@ -1033,6 +1033,10 @@ export default {
         }
         item.bookstatus = bookstatus
         item.refshYzitemLoad = false
+        item.dzmarkLoading = false
+        item.czmarkLoading = false
+        item.rowCzMark = false
+        item.rowDzMark = false
         item.atdLoading = false
         let hasGoods = 0
         item.goodsStatusList.map((gitem, gindex) => {
@@ -3565,3 +3569,8 @@ export default {
   background: #fff3e0 !important;
 }
 </style>
+<style lang="less">
+.vxe-table--render-default .vxe-body--row.row--current{
+  background: #4571e9 !important;
+}
+</style>

src/views/system/ServiceFlow/addForm.vue

@@ -1,118 +1,321 @@
 <template>
-  <a-modal
-    title="服务项目编辑"
-    :width="900"
-    :visible="visible"
-    @cancel="handleCancel"
-    :confirmLoading="confirmLoading"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item
-          label="状态名称"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          has-feedback
-        >
-          <a-input placeholder="状态名称" v-decorator="['statusSKUName', {rules: [{required: true, message: '请输入状态名称！'}]}]" />
-        </a-form-item>
-        <a-form-item
-          label="状态代码"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          has-feedback
-        >
-          <a-input placeholder="状态代码" v-decorator="['statusSKUCode', {rules: [{required: true, message: '请输入状态代码！'}]}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="显示颜色"
-        >
-          <a-input style="width: 85%;margin-right: 20px;" placeholder="显示颜色" v-decorator="['backgroundColor', {rules: [{required: true, message: '请输入显示颜色！'}]}]" />
-          <input @input="handleColor($event)" type="color">
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序"
-        >
-          <a-input-number placeholder="请输入排序" style="width: 100%" v-decorator="['sortNo']" :min="1" :max="1000" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态说明"
-        >
-          <a-textarea placeholder="状态说明" v-decorator="['statusSKUNote', {rules: [{required: true, message: '请输入状态说明！'}]}]" :rows="4" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-    <template slot="footer">
-      <a-button @click="handleCancel" >
-        关闭
-      </a-button>
-      <a-button @click="handleSubmit" type="primary">
-        保存
-      </a-button>
-      <a-button @click="handleSubmitEnable" type="primary">
-        保存并启用
-      </a-button>
-    </template>
-  </a-modal>
+  <div>
+    <a-modal
+      class="addModel"
+      title="服务流程编辑"
+      :width="1200"
+      :visible="visible"
+      @cancel="handleCancel"
+      :confirmLoading="confirmLoading">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model class="main" :model="form">
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="服务流程名称" :wrapperCol="wrapperCol" :labelCol="labelCol">
+                <a-input placeholder="服务流程名称" v-model="form.statusSKUName" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="服务流程代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="服务流程代码" v-model="form.statusSKUName" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="所属租户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-select
+                  show-search
+                  v-model="form.tenantName"
+                  @search="TenantHandleSearch"
+                  :default-active-first-option="false"
+                  :show-arrow="false"
+                  :filter-option="false"
+                  :not-found-content="null">
+                  <a-select-option v-for="item in SysTenantData" :key="item.id" :value="item.name">
+                    {{ item.name }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-item label="发布版本号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="最后发布日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="发布人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item></a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-item label="流水号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                123
+              </a-form-item></a-col>
+            <a-col :span="8"> <a-form-item label="更新人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              123
+            </a-form-item></a-col>
+            <a-col :span="8"> <a-form-item label="更新日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              123
+            </a-form-item></a-col>
+          </a-row>
+          <div>
+            <div class="title">
+              <span>服务信息</span>
+              <a v-if="!form.serviceWorkflowName" @click="addItemFlag = true">添加</a>
+            </div>
+            <div v-if="form.serviceWorkflowName">
+              <span style="margin-right: 30px;">服务名称:{{ form.serviceWorkflowName }}</span>
+              <span style="margin-right: 30px;">服务代码:{{ form.serviceWorkflowCode }}</span>
+              <a @click="addItemFlag = true">修改</a>
+            </div>
+          </div>
+          <div>
+            <div class="title">
+              <span>状态</span>
+              <a @click="activeFlag = true">添加</a>
+            </div>
+            <div v-if="form.serviceWorkflowName">
+              <span style="margin-right: 30px;">服务名称:{{ form.serviceWorkflowName }}</span>
+              <span style="margin-right: 30px;">服务代码:{{ form.serviceWorkflowCode }}</span>
+              <a @click="addItemFlag = true">修改</a>
+            </div>
+          </div>
+        </a-form-model>
+      </a-spin>
+      <template slot="footer">
+        <a-button @click="handleCancel">
+          关闭
+        </a-button>
+        <a-button @click="handleSubmit" type="primary">
+          保存
+        </a-button>
+        <a-button @click="handleSubmitEnable" type="primary">
+          保存并启用
+        </a-button>
+      </template>
+    </a-modal>
+    <a-modal title="服务项目" :width="800" :visible="addItemFlag" @cancel="addItemFlag = false">
+      <div>
+        <span>服务项目：</span>
+        <a-select
+          show-search
+          placeholder="请选择租户名称"
+          v-model="serviceItem"
+          style="width: 300px;margin-right: 20px;"
+          @search="projectSearch"
+          :default-active-first-option="false"
+          :show-arrow="false"
+          :filter-option="false"
+          :not-found-content="null">
+          <a-select-option v-for="item in projectList" :key="item.pkId" :value="item.pkId">
+            {{ item.serviceProjectName }}
+          </a-select-option>
+        </a-select>
+        <a @click="handleInto">引入</a>
+      </div>
+      <template slot="footer">
+        <a-button @click="addItemFlag = false">
+          关闭
+        </a-button>
+      </template>
+    </a-modal>
+    <a-modal title="流程活动引入" :width="800" :visible="activeFlag" @cancel="activeFlag = false">
+      <div>
+        <a-form-model :labelCol="{ span: 3 }" :wrapperCol="{ span: 21 }" :model="activeForm">
+          <a-form-model-item style="margin-bottom: 10px;" label="流程活动">
+            <a-select
+              show-search
+              placeholder="请选择流程活动"
+              v-model="activeForm.id"
+              style="width: 300px;margin-right: 20px;"
+              @search="activeSearch"
+              :default-active-first-option="false"
+              :show-arrow="false"
+              :filter-option="false"
+              :not-found-content="null">
+              <a-select-option v-for="item in activeList" :key="item.pkId" :value="item.pkId">
+                {{ item.showName }}
+              </a-select-option>
+            </a-select>
+            <a @click="addActiveFlag = true">添加</a>
+          </a-form-model-item>
+          <a-form-model-item style="margin-bottom: 10px;" label="顺序号">
+            <a-input-number v-model="activeForm.sort" :min="1" :max="100" />
+          </a-form-model-item>
+          <a-form-model-item label="值类型">
+            <a-select placeholder="请选择值类型" v-model="activeForm.type" style="width: 300px;margin-right: 20px;">
+              <a-select-option value="时间">时间</a-select-option>
+              <a-select-option value="字符串">字符串</a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-form-model>
+      </div>
+      <template slot="footer">
+        <a-button @click="handleSaveActive">
+          确定
+        </a-button>
+        <a-button @click="activeFlag = false">
+          关闭
+        </a-button>
+      </template>
+    </a-modal>
+    <a-modal title="服务活动新增" :width="800" :visible="addActiveFlag" @cancel="addActiveFlag = false">
+      <div>
+        <a-form-model :labelCol="{ span: 3 }" :wrapperCol="{ span: 21 }" :model="addActiveForm">
+          <a-form-model-item style="margin-bottom: 10px;" label="状态名称">
+            <a-select
+              show-search
+              placeholder="请选择状态名称"
+              v-model="addActiveForm.id"
+              style="width: 300px;margin-right: 20px;"
+              @search="statusSearch"
+              @change="handleChangeStatus"
+              :default-active-first-option="false"
+              :show-arrow="false"
+              :filter-option="false"
+              :not-found-content="null">
+              <a-select-option v-for="item in activeList" :key="item.pkId" :value="item.pkId">
+                {{ item.showName }}
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+          <a-form-model-item style="margin-bottom: 10px;" label="状态代码">
+            123
+          </a-form-model-item>
+          <a-form-model-item style="margin-bottom: 10px;" label="活动名称">
+            <a-input v-model="addActiveForm.name" />
+          </a-form-model-item>
+        </a-form-model>
+      </div>
+      <template slot="footer">
+        <a-button @click="handleSaveActive">
+          确定
+        </a-button>
+        <a-button @click="addActiveFlag = false">
+          关闭
+        </a-button>
+      </template>
+    </a-modal>
+  </div>
 </template>
 <script>
-  import { StatusSkuBaseSave, StatusSkuBaseSavAndEnable } from '@/api/modular/system/appManage'
-  export default {
-    data () {
-      return {
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 }
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 15 }
-        },
-        visible: false,
-        confirmLoading: false,
-        form: this.$form.createForm(this)
-      }
-    },
-    methods: {
-      // 初始化方法
-      add () {
-        this.visible = true
+import { StatusSkuBaseSave, StatusSkuBaseSavAndEnable, projectQueryList, QueryActivitiesList, QueryListStatus } from '@/api/modular/system/appManage'
+import { SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
+export default {
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
       },
-      handleSubmit () {
-        const { form: { validateFields } } = this
-        this.confirmLoading = true
-        validateFields((errors, values) => {
-          if (!errors) {
-            values.pkId = null
-            StatusSkuBaseSave(values).then((res) => {
-              this.confirmLoading = false
-              if (res.data.succ) {
-                this.$message.success('新增成功')
-                this.handleCancel()
-                this.$emit('ok', values)
-              } else {
-                this.$message.error('新增失败：' + res.data.msg)
-              }
-            }).finally((res) => {
-              this.confirmLoading = false
-            })
-          } else {
-            this.confirmLoading = false
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 17 }
+      },
+      serviceItem: '',
+      activeForm: {
+        sort: 1
+      },
+      addItemFlag: false,
+      visible: false,
+      activeFlag: false,
+      addActiveFlag: false,
+      statusList: [],
+      addActiveForm: {},
+      projectList: [],
+      activeList: [],
+      form: {},
+      confirmLoading: false,
+      SysTenantData: []
+    }
+  },
+  mounted() {
+    SysTenantPage().then(res => {
+      this.SysTenantData = res.data.rows
+    })
+    projectQueryList().then(res => {
+      this.projectList = res.data.ext
+    })
+    QueryActivitiesList().then(res => {
+      this.activeList = res.data.ext
+    })
+    QueryListStatus().then(res => {
+      this.statusList = res.data.ext
+    })
+  },
+  methods: {
+    // 初始化方法
+    add() {
+      this.visible = true
+    },
+    handleSaveActive() {
+      console.log(this.activeForm)
+    },
+    handleChangeStatus(){
+      
+    },
+    handleInto() {
+      if (!this.serviceItem) {
+        this.$message.warning('请先选择')
+        return false
+      } else {
+        this.projectList.forEach(item => {
+          if (item.pkId === this.serviceItem) {
+            this.form.serviceWorkflowCode = item.serviceProjectCode
+            this.form.serviceWorkflowName = item.serviceProjectName
+            this.addItemFlag = false
           }
         })
-      },
-      handleColor(e) {
-        this.form.setFieldsValue({
-          backgroundColor: e.target.value
+      }
+    },
+    handleSubmit() {
+      const { form: { validateFields } } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          values.pkId = null
+          StatusSkuBaseSave(values).then((res) => {
+            this.confirmLoading = false
+            if (res.data.succ) {
+              this.$message.success('新增成功')
+              this.handleCancel()
+              this.$emit('ok', values)
+            } else {
+              this.$message.error('新增失败：' + res.data.msg)
+            }
+          }).finally((res) => {
+            this.confirmLoading = false
           })
-      },
-      handleSubmitEnable() {
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleColor(e) {
+      this.form.setFieldsValue({
+        backgroundColor: e.target.value
+      })
+    },
+    handleSubmitEnable() {
       const { form: { validateFields } } = this
       this.confirmLoading = true
       validateFields((errors, values) => {
@@ -135,10 +338,47 @@
         }
       })
     },
-      handleCancel () {
-        this.form.resetFields()
-        this.visible = false
-      }
+    TenantHandleSearch(data) {
+      SysTenantPage({ name: data }).then(res => {
+        this.SysTenantData = res.data.rows
+      })
+    },
+    activeSearch(data) {
+      QueryActivitiesList({ queryItem: data }).then(res => {
+        this.activeList = res.data.ext
+      })
+    },
+    statusSearch(data) {
+      QueryListStatus({ queryItem: data }).then(res => {
+        this.statusList = res.data.ext
+      })
+    },
+    projectSearch(data) {
+      projectQueryList({ queryItem: data }).then(res => {
+        this.projectList = res.data.ext
+      })
+    },
+    handleCancel() {
+      this.visible = false
     }
   }
+}
 </script>
+<style scoped lang="less">
+/deep/ .main .ant-form-item {
+  margin-bottom: 0px;
+
+  div {
+    line-height: 30px;
+  }
+}
+
+.title {
+  border-bottom: 1px solid rgb(139, 137, 137);
+  padding-bottom: 5px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 15px;
+}
+</style>